diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 4ef6b2f..dc2607c 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -13,43 +13,27 @@ on: tags: - "v[0-9]+.[0-9]+.[0-9]+" -permissions: - contents: write - jobs: create_release: name: Create release - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v4 - - - name: Get the release version - if: env.VERSION == '' - run: echo "VERSION=${{ github.ref_name }}" >> $GITHUB_ENV - - - name: Show the version - run: | - echo "version is: $VERSION" - - - name: Check that tag version and Cargo.toml version are the same - shell: bash - run: | - if ! grep -q "version = \"$VERSION\"" Cargo.toml; then - echo "version does not match Cargo.toml" >&2 - exit 1 - fi - - - name: Create GitHub release - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - run: gh release create $VERSION --draft --verify-tag --title $VERSION + runs-on: ubuntu-22.04 outputs: - version: ${{ env.VERSION }} + upload_url: ${{ steps.create_release.outputs.upload_url }} - build_release: - name: Build all the stuff + steps: + - name: Create GitHub release + id: create_release + uses: actions/create-release@v1 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + tag_name: ${{ github.ref }} + release_name: Release ${{ github.ref }} + draft: true + + release_assets: + name: Release assets needs: ['create_release'] # We need to know the upload URL runs-on: ${{ matrix.os }} # We run many different builds env: @@ -64,7 +48,6 @@ jobs: RUST_BACKTRACE: 1 strategy: - fail-fast: false matrix: build: ['linux', 'macos', 'arm-macos', 'windows'] include: @@ -131,9 +114,11 @@ jobs: fi - name: Upload release archive + uses: actions/upload-release-asset@v1.0.2 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - shell: bash - run: | - version="${{ needs.create_release.outputs.version }}" - gh release upload "$version" ${{ env.ASSET }} + with: + upload_url: ${{ needs.create_release.outputs.upload_url }} + asset_name: ${{ env.ASSET }} + asset_path: ${{ env.ASSET }} + asset_content_type: application/octet-stream diff --git a/Cargo.lock b/Cargo.lock index f77556e..18e0d1f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -320,7 +320,7 @@ checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c" [[package]] name = "fwd" -version = "0.9.2" +version = "0.9.1" dependencies = [ "anyhow", "assert_matches", diff --git a/Cargo.toml b/Cargo.toml index 97dfd81..107266e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "fwd" -version = "0.9.2" +version = "0.9.1" edition = "2021" license = "MIT" description = "Automatically forward ports to a remote server over ssh"