From 7ccd7fd1136b6c0b714c022ec752b00b3c2354fc Mon Sep 17 00:00:00 2001 From: sgoudham Date: Mon, 31 Jan 2022 23:24:03 +0000 Subject: [PATCH 1/8] Use latest version --- .github/workflows/deploy.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index c76275e..448939a 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -49,7 +49,7 @@ jobs: shell: bash - name: "Build Changelog" id: build_changelog - uses: mikepenz/release-changelog-builder-action@{latest-release} + uses: mikepenz/release-changelog-builder-action@v2.8.0 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - uses: XAMPPRocky/create-release@v1.0.2 @@ -92,7 +92,7 @@ jobs: - run: tar -czvf ${{ env.BIN }}.tar.gz --directory=target/${{ matrix.target }}/release ${{ env.BIN }} - name: "Build Changelog" id: build_changelog - uses: mikepenz/release-changelog-builder-action@{latest-release} + uses: mikepenz/release-changelog-builder-action@v2.8.0 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - uses: XAMPPRocky/create-release@v1.0.2 @@ -148,7 +148,7 @@ jobs: - run: tar -czvf ${{ env.BIN }}.tar.gz --directory=target/${{ matrix.target }}/release ${{ env.BIN }} - name: "Build Changelog" id: build_changelog - uses: mikepenz/release-changelog-builder-action@{latest-release} + uses: mikepenz/release-changelog-builder-action@v2.8.0 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - uses: XAMPPRocky/create-release@v1.0.2 From 24903a072b7e6333ea2b5945e2be436d9feeb03f Mon Sep 17 00:00:00 2001 From: sgoudham Date: Mon, 31 Jan 2022 23:37:35 +0000 Subject: [PATCH 2/8] Update download url --- .github/workflows/deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 448939a..0dc22e5 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -186,7 +186,7 @@ jobs: formula-name: ${{ env.BIN }} formula-path: Formula/${{ env.BIN }}.rb homebrew-tap: sgoudham/tap - download-url: https://github.com/sgoudham/${{ env.BIN }}/releases/download/${{ github.ref }}/${{ env.BIN }}-${{ matrix.target }}.tar.gz + download-url: https://github.com/sgoudham/${{ env.BIN }}/releases/download/${{ steps.extract-version.outputs.tag-name }}/${{ env.BIN }}-${{ matrix.target }}.tar.gz commit-message: | {{formulaName}} {{version}} From fdb6074122b439db55a9037e0e12c199b74717da Mon Sep 17 00:00:00 2001 From: sgoudham Date: Mon, 31 Jan 2022 23:50:56 +0000 Subject: [PATCH 3/8] Update changelog separately --- .github/workflows/deploy.yml | 39 +++++++++++++++++++----------------- 1 file changed, 21 insertions(+), 18 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 0dc22e5..0f94c08 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -47,11 +47,6 @@ jobs: 7z a "${{ env.BIN }}.zip" "${{ env.BIN }}.exe" mv "${{ env.BIN }}.zip" $GITHUB_WORKSPACE shell: bash - - name: "Build Changelog" - id: build_changelog - uses: mikepenz/release-changelog-builder-action@v2.8.0 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - uses: XAMPPRocky/create-release@v1.0.2 id: create_release env: @@ -59,7 +54,6 @@ jobs: with: tag_name: ${{ github.ref }} release_name: ${{ github.ref }} - body: ${{steps.github_release.outputs.changelog}} draft: false prerelease: false - uses: actions/upload-release-asset@v1 @@ -90,11 +84,6 @@ jobs: - run: scripts/set_rust_version.bash stable ${{ matrix.target }} - run: scripts/build.bash cross ${{ matrix.target }} RELEASE - run: tar -czvf ${{ env.BIN }}.tar.gz --directory=target/${{ matrix.target }}/release ${{ env.BIN }} - - name: "Build Changelog" - id: build_changelog - uses: mikepenz/release-changelog-builder-action@v2.8.0 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - uses: XAMPPRocky/create-release@v1.0.2 id: create_release env: @@ -102,7 +91,6 @@ jobs: with: tag_name: ${{ github.ref }} release_name: ${{ github.ref }} - body: ${{steps.github_release.outputs.changelog}} draft: false prerelease: false - uses: actions/upload-release-asset@v1 @@ -146,11 +134,6 @@ jobs: - run: scripts/set_rust_version.bash stable ${{ matrix.target }} - run: scripts/build.bash /tmp/cross ${{ matrix.target }} RELEASE - run: tar -czvf ${{ env.BIN }}.tar.gz --directory=target/${{ matrix.target }}/release ${{ env.BIN }} - - name: "Build Changelog" - id: build_changelog - uses: mikepenz/release-changelog-builder-action@v2.8.0 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - uses: XAMPPRocky/create-release@v1.0.2 id: create_release env: @@ -158,7 +141,6 @@ jobs: with: tag_name: ${{ github.ref }} release_name: ${{ github.ref }} - body: ${{steps.github_release.outputs.changelog}} draft: false prerelease: false - name: Upload Release Asset @@ -171,6 +153,27 @@ jobs: asset_path: ${{ env.BIN }}.tar.gz asset_name: ${{ env.BIN }}-${{ matrix.target }}.tar.gz asset_content_type: application/gzip + + changelog: + name: Release Changelog + needs: + - windows + - macos + - linux + runs-on: ubuntu-latest + steps: + - name: "Build Changelog" + id: build_changelog + uses: mikepenz/release-changelog-builder-action@v2.8.0 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + - name: Update release + uses: johnwbyrd/update-release@v1 + with: + token: ${{ secrets.GITHUB_TOKEN }} + body: ${{steps.github_release.outputs.changelog}} + + homebrew: name: Bump Homebrew formula needs: macos From 2004a7221da2b51341decc3b35ea6c0553ba6f54 Mon Sep 17 00:00:00 2001 From: sgoudham Date: Mon, 31 Jan 2022 23:54:15 +0000 Subject: [PATCH 4/8] Remove bump homebrew from macOS step --- .github/workflows/deploy.yml | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 0f94c08..cdfa416 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -102,18 +102,6 @@ jobs: asset_path: ${{ env.BIN }}.tar.gz asset_name: ${{ env.BIN }}-${{ matrix.target }}.tar.gz asset_content_type: application/gzip - - uses: mislav/bump-homebrew-formula-action@v1 - if: "!contains(github.ref, '-')" # skip prereleases - with: - formula-name: ${{ env.BIN }} - homebrew-tap: sgoudham/tap - download-url: https://github.com/sgoudham/${{ env.BIN }}/releases/download/${{ github.ref }}/${{ env.BIN }}-${{ matrix.target }}.tar.gz - commit-message: | - {{formulaName}} {{version}} - - Created by https://github.com/mislav/bump-homebrew-formula-action - env: - COMMITTER_TOKEN: ${{ secrets.HOMEBREW }} linux: runs-on: ubuntu-latest From 5819ebb7cb453df80e1799ddf1ea0c18af97468a Mon Sep 17 00:00:00 2001 From: sgoudham Date: Tue, 1 Feb 2022 00:01:44 +0000 Subject: [PATCH 5/8] Fix version number and download url --- .github/workflows/deploy.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index cdfa416..794a777 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -156,7 +156,7 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Update release - uses: johnwbyrd/update-release@v1 + uses: johnwbyrd/update-release@v1.0.0 with: token: ${{ secrets.GITHUB_TOKEN }} body: ${{steps.github_release.outputs.changelog}} @@ -177,7 +177,7 @@ jobs: formula-name: ${{ env.BIN }} formula-path: Formula/${{ env.BIN }}.rb homebrew-tap: sgoudham/tap - download-url: https://github.com/sgoudham/${{ env.BIN }}/releases/download/${{ steps.extract-version.outputs.tag-name }}/${{ env.BIN }}-${{ matrix.target }}.tar.gz + download-url: https://github.com/sgoudham/${{ env.BIN }}/releases/download/${{ steps.extract-version.outputs.tag-name }}/${{ env.BIN }}-x86_64-apple-darwin.tar.gz commit-message: | {{formulaName}} {{version}} From d8e5508580771deb8f24240a69ba320b946c33b3 Mon Sep 17 00:00:00 2001 From: sgoudham Date: Tue, 1 Feb 2022 00:06:24 +0000 Subject: [PATCH 6/8] Fix repository link --- .github/workflows/deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 794a777..f2ddd03 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -176,7 +176,7 @@ jobs: with: formula-name: ${{ env.BIN }} formula-path: Formula/${{ env.BIN }}.rb - homebrew-tap: sgoudham/tap + homebrew-tap: sgoudham/homebrew-tap download-url: https://github.com/sgoudham/${{ env.BIN }}/releases/download/${{ steps.extract-version.outputs.tag-name }}/${{ env.BIN }}-x86_64-apple-darwin.tar.gz commit-message: | {{formulaName}} {{version}} From 30bcb7ef797d2ed073d6c19fef01d674f71cbb0a Mon Sep 17 00:00:00 2001 From: sgoudham Date: Tue, 1 Feb 2022 00:15:11 +0000 Subject: [PATCH 7/8] Remove generate changelog --- .github/workflows/deploy.yml | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index f2ddd03..3ad9081 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -142,26 +142,6 @@ jobs: asset_name: ${{ env.BIN }}-${{ matrix.target }}.tar.gz asset_content_type: application/gzip - changelog: - name: Release Changelog - needs: - - windows - - macos - - linux - runs-on: ubuntu-latest - steps: - - name: "Build Changelog" - id: build_changelog - uses: mikepenz/release-changelog-builder-action@v2.8.0 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - name: Update release - uses: johnwbyrd/update-release@v1.0.0 - with: - token: ${{ secrets.GITHUB_TOKEN }} - body: ${{steps.github_release.outputs.changelog}} - - homebrew: name: Bump Homebrew formula needs: macos From 5ae5c2d5278a8c58ad61a64bf489d779a8ce9ff5 Mon Sep 17 00:00:00 2001 From: sgoudham Date: Tue, 1 Feb 2022 00:15:38 +0000 Subject: [PATCH 8/8] Format commit --- .github/workflows/deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 3ad9081..3fd3deb 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -159,7 +159,7 @@ jobs: homebrew-tap: sgoudham/homebrew-tap download-url: https://github.com/sgoudham/${{ env.BIN }}/releases/download/${{ steps.extract-version.outputs.tag-name }}/${{ env.BIN }}-x86_64-apple-darwin.tar.gz commit-message: | - {{formulaName}} {{version}} + {{formulaName}} -> {{version}} Created by https://github.com/mislav/bump-homebrew-formula-action env: