Skip to content

merge: sync staging with master #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ChinoGoblino merged 4 commits into from
Sep 6, 2025
Merged

merge: sync staging with master #12

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a51c31e
fix: whitepace for variable reference
ChinoGoblino Sep 6, 2025
6b0aa0b
fix: missing curly brace
ChinoGoblino Sep 6, 2025
e738ff1
fix: incorrect variable name
ChinoGoblino Sep 6, 2025
a938f50
Merge branch 'staging'
ChinoGoblino Sep 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/docker.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
file: Dockerfile
tags: |
ghcr.io/devsoc-unsw/${{ env.IMAGE_NAME }}:${{ github.sha }}
ghcr.io/devsoc-unsw/${{ env.IMAGGE_NAME }}:latest
ghcr.io/devsoc-unsw/${{ env.IMAGE_NAME }}:latest
labels: ${{ steps.meta.outputs.labels }}
cache-from: type=gha
cache-to: type=gha,mode=max
Expand All @@ -63,10 +63,10 @@ jobs:
git config user.email "technical@csesoc.org.au"

git checkout -b update/${{ env.IMAGE_NAME }}/${{ github.sha }}
yq -i '.items[0].spec.template.spec.containers[0].image = "ghcr.io/devsoc-unsw/${{ env.IMAGE_NAME}:${{ github.sha }}"' projects/hasuragres/${{ env.ENVIRONMENT }}/hasuragres.yml
yq -i '.items[0].spec.template.spec.containers[0].image = "ghcr.io/devsoc-unsw/${{ env.IMAGE_NAME }}:${{ github.sha }}"' projects/hasuragres/${{ env.ENVIRONMENT }}/hasuragres.yml

git add .
git commit -m "feat(${{ env.IMAGE_NAME }}): update image"
git push -u origin update/${{ env.IMAGE_NAME }}/${{ github.sha }}
gh pr create -B dev --title "feat(${{ env.IMAGE_NAME}}): update image" --body "Updates the image for the ${{ env.IMAGE_NAME }} deployment to commit devsoc-unsw/${{ env.IMAGE_NAME }}@${{ github.sha }}." > URL
gh pr create -B dev --title "feat(${{ env.IMAGE_NAME }}): update image" --body "Updates the image for the ${{ env.IMAGE_NAME }} deployment to commit devsoc-unsw/${{ env.IMAGE_NAME }}@${{ github.sha }}." > URL
gh pr merge $(cat URL) --squash -d