From f0d0c4c9871e0c4b332209358f99a698c1b848de Mon Sep 17 00:00:00 2001 From: george haff Date: Mon, 21 Aug 2023 12:09:41 -0400 Subject: [PATCH 1/2] Revert "#1015 ci delete deprecated set output (#1273)" This reverts commit 09036abd744911be13cbaab5639b0d6f3c7f8e75. --- .github/workflows/create-release.yml | 2 +- .github/workflows/release-helper.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml index 3cc2afd66..ab92a289e 100644 --- a/.github/workflows/create-release.yml +++ b/.github/workflows/create-release.yml @@ -29,7 +29,7 @@ jobs: id: version run: | python -m pip install bump2version - echo -n "next_tag={next_tag}" >> $GITHUB_OUTPUT + echo -n $next_tag >> $GITHUB_OUTPUT bump2version --list ${{ github.event.inputs.versionName }} | grep new_version | sed -r s,"^.*=",, - name: Create pull request into prod uses: peter-evans/create-pull-request@v3 diff --git a/.github/workflows/release-helper.yml b/.github/workflows/release-helper.yml index 6a48c40b0..a15887ed7 100644 --- a/.github/workflows/release-helper.yml +++ b/.github/workflows/release-helper.yml @@ -29,7 +29,7 @@ jobs: id: extract_version run: | python -m pip install bump2version - echo -n "version={version}" >> $GITHUB_OUTPUT + echo -n $version >> $GITHUB_OUTPUT bump2version --dry-run --list patch | grep ^current_version | sed -r s,"^.*=",, - name: Create Release id: create_release From 51471ece075b59713e894506fc59b82658770613 Mon Sep 17 00:00:00 2001 From: george haff Date: Mon, 21 Aug 2023 12:09:54 -0400 Subject: [PATCH 2/2] Revert "updated the workflow to use the latest version of the `actions/checkout` action and ensure that the code is checked out correctly for each repository. (#1262)" This reverts commit beeb737b32fafa8efd4d494d79d6f725f5569b8b. --- .github/workflows/ci.yaml | 24 ++++++++++++------------ .github/workflows/create-release.yml | 6 +++--- .github/workflows/missing_signals.yaml | 4 ++-- .github/workflows/release-helper.yml | 6 +++--- .github/workflows/update_gdocs_data.yml | 4 ++-- 5 files changed, 22 insertions(+), 22 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 9a477517c..1f7664b46 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -7,12 +7,12 @@ jobs: steps: - run: mkdir -p repos/undefx - name: Checkout undefx/py3tester - uses: actions/checkout@v3 + uses: actions/checkout@v2 with: repository: undefx/py3tester path: repos/undefx/py3tester - name: Checkout undefx/undef-analysis - uses: actions/checkout@v3 + uses: actions/checkout@v2 with: repository: undefx/undef-analysis path: repos/undefx/undef-analysis @@ -20,31 +20,31 @@ jobs: - run: mkdir -p repos/delphi - name: Checkoutcmu-delphi/operations - uses: actions/checkout@v3 + uses: actions/checkout@v2 with: repository: cmu-delphi/operations path: repos/delphi/operations - name: Checkout cmu-delphi/utils - uses: actions/checkout@v3 + uses: actions/checkout@v2 with: repository: cmu-delphi/utils path: repos/delphi/utils - name: Checkout cmu-delphi/github-deploy-repo - uses: actions/checkout@v3 + uses: actions/checkout@v2 with: repository: cmu-delphi/github-deploy-repo path: repos/delphi/github-deploy-repo - name: Checkout THIS REPO - uses: actions/checkout@v3 + uses: actions/checkout@v2 with: path: repos/delphi/delphi-epidata - name: Checkout cmu-delphi/flu-contest - uses: actions/checkout@v3 + uses: actions/checkout@v2 with: repository: cmu-delphi/flu-contest path: repos/delphi/flu-contest - name: Checkout cmu-delphi/nowcast - uses: actions/checkout@v3 + uses: actions/checkout@v2 with: repository: cmu-delphi/nowcast path: repos/delphi/nowcast @@ -98,7 +98,7 @@ jobs: working-directory: src/client/packaging/npm steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v2 - uses: actions/setup-node@v2 with: node-version: '14.x' @@ -121,7 +121,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Check out code - uses: actions/checkout@v3 + uses: actions/checkout@v2 - name: Login to GitHub Container Registry uses: docker/login-action@v1 with: @@ -141,8 +141,8 @@ jobs: if [ "$imageTag" = "main" ] ; then imageTag="latest" fi - echo "tag=$imageTag" >> "$GITHUB_OUTPUT" - echo "repo=ghcr.io/${{ github.repository }}" >> "$GITHUB_OUTPUT" + echo "::set-output name=tag::$imageTag" + echo "::set-output name=repo::ghcr.io/${{ github.repository }}" - name: Push Dev Tag run: | docker tag repo ${{ steps.tagname.outputs.repo }}:${{ steps.tagname.outputs.tag }} diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml index ab92a289e..329fa76aa 100644 --- a/.github/workflows/create-release.yml +++ b/.github/workflows/create-release.yml @@ -13,7 +13,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Check out code - uses: actions/checkout@v3 + uses: actions/checkout@v2 with: ref: main ssh-key: ${{ secrets.CMU_DELPHI_DEPLOY_MACHINE_SSH }} @@ -22,14 +22,14 @@ jobs: git fetch origin dev:dev git reset --hard origin/dev - name: Set up Python 3.8 - uses: actions/setup-python@v4 + uses: actions/setup-python@v2 with: python-version: 3.8 - name: Change version number id: version run: | python -m pip install bump2version - echo -n $next_tag >> $GITHUB_OUTPUT + echo -n "::set-output name=next_tag::" bump2version --list ${{ github.event.inputs.versionName }} | grep new_version | sed -r s,"^.*=",, - name: Create pull request into prod uses: peter-evans/create-pull-request@v3 diff --git a/.github/workflows/missing_signals.yaml b/.github/workflows/missing_signals.yaml index c3bb37b36..1b204edb4 100644 --- a/.github/workflows/missing_signals.yaml +++ b/.github/workflows/missing_signals.yaml @@ -8,11 +8,11 @@ jobs: runs-on: ubuntu-latest steps: - name: Check out code - uses: actions/checkout@v3 + uses: actions/checkout@v2 with: ref: dev - name: Set up Python 3.8 - uses: actions/setup-python@v4 + uses: actions/setup-python@v2 with: python-version: 3.8 - name: Install Dependencies diff --git a/.github/workflows/release-helper.yml b/.github/workflows/release-helper.yml index a15887ed7..71eb94d9f 100644 --- a/.github/workflows/release-helper.yml +++ b/.github/workflows/release-helper.yml @@ -18,18 +18,18 @@ jobs: runs-on: ubuntu-latest steps: - name: Check out code - uses: actions/checkout@v3 + uses: actions/checkout@v2 with: ssh-key: ${{ secrets.CMU_DELPHI_DEPLOY_MACHINE_SSH }} - name: Set up Python 3.8 - uses: actions/setup-python@v4 + uses: actions/setup-python@v2 with: python-version: 3.8 - name: Extract version id: extract_version run: | python -m pip install bump2version - echo -n $version >> $GITHUB_OUTPUT + echo -n "::set-output name=version::" bump2version --dry-run --list patch | grep ^current_version | sed -r s,"^.*=",, - name: Create Release id: create_release diff --git a/.github/workflows/update_gdocs_data.yml b/.github/workflows/update_gdocs_data.yml index d5b1a5e31..c2d6f0c07 100644 --- a/.github/workflows/update_gdocs_data.yml +++ b/.github/workflows/update_gdocs_data.yml @@ -6,12 +6,12 @@ jobs: runs-on: ubuntu-latest steps: - name: Check out code - uses: actions/checkout@v3 + uses: actions/checkout@v2 with: branch: dev ssh-key: ${{ secrets.CMU_DELPHI_DEPLOY_MACHINE_SSH }} - name: Set up Python 3.8 - uses: actions/setup-python@v4 + uses: actions/setup-python@v2 with: python-version: 3.8 - uses: actions/cache@v2