diff --git a/.github/workflows/comment.yml b/.github/workflows/comment.yml index 72870ff..a8da750 100644 --- a/.github/workflows/comment.yml +++ b/.github/workflows/comment.yml @@ -18,7 +18,7 @@ jobs: - uses: actions/checkout@v3 - name: Authenticate with Google Cloud id: auth - uses: google-github-actions/auth@v0 + uses: google-github-actions/auth@v2 with: credentials_json: ${{ secrets.GCR_KEY }} - name: Setup Google Cloud SDK diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d53d0da..e5df1cd 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -33,7 +33,7 @@ jobs: token: ${{ secrets.BOT_TOKEN }} - name: Authenticate with Google Cloud id: auth - uses: google-github-actions/auth@v0 + uses: google-github-actions/auth@v2 with: credentials_json: ${{ secrets.GCR_KEY }} - name: Setup Google Cloud SDK @@ -54,12 +54,12 @@ jobs: run: | PR=$(echo "$GITHUB_REF" | awk -F / '{print $3}') echo "$PR" - echo "pr_number=pr-$PR" >> $GITHUB_OUTPUT + echo "pr_number=pr-$PR" >> $GITHUB_ENV - name: Publish dev Chart if: github.ref != 'refs/heads/main' run: | - mv $IMAGE-${{ env.HELM_VERSION }}.tgz $IMAGE-${{ steps.tag.outputs.pr_number }}.tgz + mv $IMAGE-${{ env.HELM_VERSION }}.tgz $IMAGE-${{ env.pr_number }}.tgz gsutil cp $IMAGE-*.tgz gs://$ARTIFACT_BUCKET/$IMAGE/ - name: Set current tag @@ -67,7 +67,7 @@ jobs: id: vars run: | git fetch --tags - echo "tag=$(git describe --tags --abbrev=0)" >> $GITHUB_OUTPUT + echo "tag=$(git describe --tags --abbrev=0)" >> $GITHUB_ENV - name: update versions if: github.ref != 'refs/heads/main' @@ -77,19 +77,19 @@ jobs: auto patch increment shell: bash run: | - echo "Current git version: ${{ steps.vars.outputs.tag }}" + echo "Current git version: ${{ env.tag }}" export APP_VERSION=$(grep -E "appVersion:\s+" $CHART_DIRECTORY/Chart.yaml | cut -d" " -f2 | sed -r 's/"//g') export CHART_VERSION=$(grep -E "version:\s+" $CHART_DIRECTORY/Chart.yaml | cut -d" " -f2 | sed -r 's/"//g') echo "appVersion: $APP_VERSION" echo "chartVersion: $CHART_VERSION" - if [ ${{ steps.vars.outputs.tag }} = $APP_VERSION ]; then + if [ ${{ env.tag }} = $APP_VERSION ]; then echo "versions match, incrementing patch" - OLD_PATCH=$(echo ${{ steps.vars.outputs.tag }} | cut -d '.' -f3) + OLD_PATCH=$(echo ${{ env.tag }} | cut -d '.' -f3) echo "OLD patch: $OLD_PATCH" NEW_PATCH=$(($OLD_PATCH + 1)) echo "New patch version: $NEW_PATCH" - NEW_APP_VERSION="appVersion: $(echo ${{ steps.vars.outputs.tag }} | sed -e "s/[0-9]\{1,3\}/$NEW_PATCH/3")" - NEW_CHART_VERSION="version: $(echo ${{ steps.vars.outputs.tag }} | sed -e "s/[0-9]\{1,3\}/$NEW_PATCH/3")" + NEW_APP_VERSION="appVersion: $(echo ${{ env.tag }} | sed -e "s/[0-9]\{1,3\}/$NEW_PATCH/3")" + NEW_CHART_VERSION="version: $(echo ${{ env.tag }} | sed -e "s/[0-9]\{1,3\}/$NEW_PATCH/3")" sed -i -e "s/appVersion: .*/$NEW_APP_VERSION/g" $CHART_DIRECTORY/Chart.yaml sed -i -e "s/version: .*/$NEW_CHART_VERSION/g" $CHART_DIRECTORY/Chart.yaml git config user.name "ras-rm-pr-bot" @@ -127,7 +127,7 @@ jobs: id: release shell: bash run: | - echo "version=$(grep -E "appVersion:\s+" $CHART_DIRECTORY/Chart.yaml | cut -d" " -f2 | sed -r 's/"//g')" >> $GITHUB_OUTPUT + echo "version=$(grep -E "appVersion:\s+" $CHART_DIRECTORY/Chart.yaml | cut -d" " -f2 | sed -r 's/"//g')" >> $GITHUB_ENV - name: Publish Charts if: github.ref == 'refs/heads/main' @@ -140,11 +140,11 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: - tag_name: ${{ steps.release.outputs.version }} - release_name: ${{ steps.release.outputs.version }} + tag_name: ${{ env.version }} + release_name: ${{ env.version }} body: | Automated release - ${{ steps.release.outputs.version }} + ${{ env.version }} draft: false prerelease: false diff --git a/_infra/helm/uaa/Chart.yaml b/_infra/helm/uaa/Chart.yaml index 40b7a44..6c17eb7 100644 --- a/_infra/helm/uaa/Chart.yaml +++ b/_infra/helm/uaa/Chart.yaml @@ -14,8 +14,8 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. -version: 2.1.10 +version: 2.1.11 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. -appVersion: 2.1.10 +appVersion: 2.1.11