Skip to content

Commit

Permalink
Fix CI after 0.12.0 merge.
Browse files Browse the repository at this point in the history
  • Loading branch information
benmcmorran committed Feb 13, 2023
1 parent 7960b58 commit 845cb77
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/snapshot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand All @@ -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 }}
Expand Down Expand Up @@ -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 }}
Expand Down
2 changes: 1 addition & 1 deletion microsoft/static-linux-build/entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
echo "artifact-name=${openocd_name}.tar.gz" >> $GITHUB_OUTPUT

0 comments on commit 845cb77

Please sign in to comment.