From 8f24a9308a57877d0b650d85edd6804706b4d1a8 Mon Sep 17 00:00:00 2001 From: Nat DeFries <42820733+nmdefries@users.noreply.github.com> Date: Fri, 30 Jun 2023 16:06:51 -0400 Subject: [PATCH 1/7] bump actions/checkout version to use new node --- .github/workflows/ci.yaml | 4 ++-- .github/workflows/s3_upload_ec2.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index c6d21a8..2dbcbf7 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -6,7 +6,7 @@ jobs: build: runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - uses: r-lib/actions/setup-r@v2 with: use-public-rspm: true @@ -26,7 +26,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Check out code - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Pull Image Data run: make pull_data - name: Login to GitHub Container Registry diff --git a/.github/workflows/s3_upload_ec2.yml b/.github/workflows/s3_upload_ec2.yml index b17ad1f..379b9ff 100644 --- a/.github/workflows/s3_upload_ec2.yml +++ b/.github/workflows/s3_upload_ec2.yml @@ -25,7 +25,7 @@ jobs: run: sudo chown -R $USER:$USER $GITHUB_WORKSPACE # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Test AWS cli installation run: aws --version From 6358f442ffa5aca00bb3be5c8162ec129dddaf0b Mon Sep 17 00:00:00 2001 From: Nat DeFries <42820733+nmdefries@users.noreply.github.com> Date: Fri, 30 Jun 2023 16:09:08 -0400 Subject: [PATCH 2/7] bump pipeline aws config and login actions version to use new node --- .github/workflows/s3_upload_ec2.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/s3_upload_ec2.yml b/.github/workflows/s3_upload_ec2.yml index 379b9ff..2489886 100644 --- a/.github/workflows/s3_upload_ec2.yml +++ b/.github/workflows/s3_upload_ec2.yml @@ -31,14 +31,14 @@ jobs: run: aws --version - name: Configure AWS credentials - uses: aws-actions/configure-aws-credentials@v1 + uses: aws-actions/configure-aws-credentials@v2 with: aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY }} aws-secret-access-key: ${{ secrets.AWS_SECRET_KEY }} aws-region: ${{ env.AWS_REGION_NAME }} - name: Login to GitHub Container Registry - uses: docker/login-action@v1 + uses: docker/login-action@v2 with: registry: ghcr.io username: cmu-delphi-deploy-machine From 06b6ff4672754d4da829798be4f474aa10a8e453 Mon Sep 17 00:00:00 2001 From: Nat DeFries <42820733+nmdefries@users.noreply.github.com> Date: Fri, 30 Jun 2023 16:15:40 -0400 Subject: [PATCH 3/7] bump CI login action version to use new node --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 2dbcbf7..1221f0e 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -30,7 +30,7 @@ jobs: - name: Pull Image Data run: make pull_data - name: Login to GitHub Container Registry - uses: docker/login-action@v1 + uses: docker/login-action@v2 with: registry: ghcr.io username: cmu-delphi-deploy-machine From cc8a27de1112e03381388112b0cb49344ae57bc6 Mon Sep 17 00:00:00 2001 From: Nat DeFries <42820733+nmdefries@users.noreply.github.com> Date: Fri, 30 Jun 2023 16:18:48 -0400 Subject: [PATCH 4/7] bump create_release PR action version --- .github/workflows/create_release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/create_release.yml b/.github/workflows/create_release.yml index 30242bf..f8ebd59 100644 --- a/.github/workflows/create_release.yml +++ b/.github/workflows/create_release.yml @@ -30,7 +30,7 @@ jobs: echo -n "::set-output name=next_tag::" bump2version --list ${{ github.event.inputs.versionName }} | grep new_version | sed -r s,"^.*=",, - name: Create pull request into main - uses: peter-evans/create-pull-request@v3 + uses: peter-evans/create-pull-request@v4 with: branch: release/${{ steps.version.outputs.next_tag }} commit-message: "chore: release ${{ steps.version.outputs.next_tag }}" From 463e373f906cc89b641666638eec325979dadeb0 Mon Sep 17 00:00:00 2001 From: Nat DeFries <42820733+nmdefries@users.noreply.github.com> Date: Mon, 3 Jul 2023 10:35:51 -0400 Subject: [PATCH 5/7] put tag, repo, and version vars into env files for ci.yaml --- .github/workflows/ci.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 1221f0e..ed57083 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -48,8 +48,8 @@ jobs: if [ "$imageTag" = "main" ] ; then imageTag="latest" fi - echo "::set-output name=tag::$imageTag" - echo "::set-output name=repo::ghcr.io/${{ github.repository }}" + echo "tag=$imageTag" >> "$GITHUB_OUTPUT" + echo "repo=ghcr.io/${{ github.repository }}" >> "$GITHUB_OUTPUT" - name: Push Dev Tag run: | docker tag repo ${{ steps.tagname.outputs.repo }}:${{ steps.tagname.outputs.tag }} @@ -64,8 +64,8 @@ jobs: id: extract_version run: | python -m pip install bump2version - echo -n "::set-output name=version::" - bump2version --dry-run --list patch | grep ^current_version | sed -r s,"^.*=",, + currentVersion=`bump2version --dry-run --list patch | grep ^current_version | sed -r s,"^.*=",,` + echo "version=$currentVersion" >> "$GITHUB_OUTPUT" - name: Trigger Webhook run: | # trigger a webhook update From 39ea25d7067fbf7c22e84fb0d89b0d4c5550339d Mon Sep 17 00:00:00 2001 From: Nat DeFries <42820733+nmdefries@users.noreply.github.com> Date: Mon, 3 Jul 2023 17:00:50 -0400 Subject: [PATCH 6/7] put tag var into env file for create_release.yaml --- .github/workflows/create_release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/create_release.yml b/.github/workflows/create_release.yml index f8ebd59..0bfb9ea 100644 --- a/.github/workflows/create_release.yml +++ b/.github/workflows/create_release.yml @@ -27,8 +27,8 @@ jobs: id: version run: | python -m pip install bump2version - echo -n "::set-output name=next_tag::" - bump2version --list ${{ github.event.inputs.versionName }} | grep new_version | sed -r s,"^.*=",, + newVersion=`bump2version --list ${{ github.event.inputs.versionName }} | grep new_version | sed -r s,"^.*=",,` + echo "next_tag=$newVersion" >> "$GITHUB_OUTPUT" - name: Create pull request into main uses: peter-evans/create-pull-request@v4 with: From 37e6911f3b92dc7e67a36a57dd22f8afd83756e8 Mon Sep 17 00:00:00 2001 From: Nat DeFries <42820733+nmdefries@users.noreply.github.com> Date: Mon, 3 Jul 2023 17:02:30 -0400 Subject: [PATCH 7/7] put version var into env file for release_main.yaml --- .github/workflows/release_main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release_main.yml b/.github/workflows/release_main.yml index 0e7fa71..af0426e 100644 --- a/.github/workflows/release_main.yml +++ b/.github/workflows/release_main.yml @@ -29,8 +29,8 @@ jobs: id: extract_version run: | python -m pip install bump2version - echo -n "::set-output name=version::" - bump2version --dry-run --list patch | grep ^current_version | sed -r s,"^.*=",, + currentVersion=`bump2version --dry-run --list patch | grep ^current_version | sed -r s,"^.*=",,` + echo "version=$currentVersion" >> "$GITHUB_OUTPUT" - name: Create Release id: create_release uses: release-drafter/release-drafter@v5