From 845cb775c199685f3852d7cedc17115f73c0c27f Mon Sep 17 00:00:00 2001 From: Ben McMorran Date: Mon, 13 Feb 2023 13:42:37 -0800 Subject: [PATCH] Fix CI after 0.12.0 merge. --- .github/workflows/snapshot.yml | 10 +++++----- microsoft/static-linux-build/entrypoint.sh | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml index 65747d64e..c75a6a706 100644 --- a/.github/workflows/snapshot.yml +++ b/.github/workflows/snapshot.yml @@ -8,7 +8,7 @@ name: OpenOCD Snapshot jobs: package-windows: - runs-on: ubuntu-latest + runs-on: [ubuntu-18.04] outputs: artifact-name: ${{ env.ARTIFACT_NAME }} env: @@ -90,10 +90,12 @@ jobs: tar -czf $ARTIFACT * echo "RELEASE_NAME=$RELEASE_NAME" >> $GITHUB_ENV echo "IS_PRE_RELEASE=$IS_PRE_RELEASE" >> $GITHUB_ENV + echo "ARTIFACT_NAME=$ARTIFACT" >> $GITHUB_ENV echo "ARTIFACT_PATH=$PWD/$ARTIFACT" >> $GITHUB_ENV - name: Publish OpenOCD packaged for windows - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: + name: ${{ env.ARTIFACT_NAME }} path: ${{ env.ARTIFACT_PATH }} package-linux: runs-on: ubuntu-latest @@ -105,7 +107,7 @@ jobs: id: package-linux uses: ./microsoft/static-linux-build - name: Publish OpenOCD packaged for Linux - uses: actions/upload-artifact@v1 + uses: actions/upload-artifact@v3 with: name: ${{ steps.package-linux.outputs.artifact-name }} path: ${{ steps.package-linux.outputs.artifact-name }} @@ -145,8 +147,6 @@ jobs: uses: actions/upload-release-asset@v1 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - name: Create Release - uses: ncipollo/release-action@v1 with: upload_url: ${{ steps.create_release.outputs.upload_url }} asset_path: ${{ needs.package-windows.outputs.artifact-name }} diff --git a/microsoft/static-linux-build/entrypoint.sh b/microsoft/static-linux-build/entrypoint.sh index df4a94dfc..d2838b0c7 100755 --- a/microsoft/static-linux-build/entrypoint.sh +++ b/microsoft/static-linux-build/entrypoint.sh @@ -83,4 +83,4 @@ readonly openocd_name="openocd-${openocd_tag}-linux" make make install-strip tar -C "${install_dir}" -czf "${workspace_dir}/${openocd_name}.tar.gz" "${openocd_name}" -echo "::set-output name=artifact-name::${openocd_name}.tar.gz" \ No newline at end of file +echo "artifact-name=${openocd_name}.tar.gz" >> $GITHUB_OUTPUT \ No newline at end of file