diff --git a/.github/workflows/build_releases.yml b/.github/workflows/build_releases.yml index 51cae98..987c85a 100644 --- a/.github/workflows/build_releases.yml +++ b/.github/workflows/build_releases.yml @@ -33,13 +33,11 @@ jobs: cross: true, } steps: - - name: Checkout repository - uses: actions/checkout@v3 + - uses: actions/checkout@v3 with: fetch-depth: 1 - - name: Set up Rust toolchain - uses: actions-rs/toolchain@v1 + - uses: actions-rs/toolchain@v1 with: profile: minimal toolchain: stable @@ -60,14 +58,9 @@ jobs: - name: Build archive shell: bash run: | - staging="heliocron-${{ env.RELEASE_VERSION }}-${{ matrix.target }}" - mkdir -p "$staging"/ - - cp {README.md,LICENSE-APACHE,LICENSE-MIT} "$staging/" - cp "target/${{ matrix.target }}/release/heliocron" "$staging/" - - tar czf "$staging.tar.gz" "$staging" - echo "ASSET=$staging.tar.gz" >> $GITHUB_ENV + cp target/${{ matrix.info.target }}/release/heliocron ./heliocron + tar -czvf "heliocron-${GITHUB_REF#refs/tags/}-${{ matrix.info.target }}.tar.gz" heliocron README.md LICENSE-APACHE LICENSE-MIT + echo "ASSET=heliocron-${GITHUB_REF#refs/tags/}-${{ matrix.info.target }}.tar.gz" >> $GITHUB_ENV - name: Create release directory for artifact, move file shell: bash diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d6aefe5..16c7754 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -24,8 +24,8 @@ jobs: - name: Publish to crates.io run: cargo publish --allow-dirty - initialize-gh-release: - name: initialize-gh-release + initialise-gh-release: + name: initialise-gh-release runs-on: ubuntu-latest steps: - name: Get the release version from the tag @@ -46,7 +46,7 @@ jobs: path: release-version build-release: - needs: [initialize-gh-release] + needs: [initialise-gh-release] uses: ./.github/workflows/build_releases.yml upload-release: