From 12817eee57751cefb59646d7cb5cc28d3d3bc37b Mon Sep 17 00:00:00 2001 From: Raymond Hill Date: Mon, 4 Nov 2024 10:12:25 -0500 Subject: [PATCH] Squashed commit of the following: commit a4d319437a25de6b98cc4dcec58f1a14ad310d63 Author: daylight Date: Fri Nov 1 21:01:06 2024 +0300 Delete .gitmodules commit 57b7d9814851e504f9c9f179a1bd594ded8184a7 Author: daylight Date: Fri Nov 1 17:47:50 2024 +0300 Delete dist/mv3/log.txt commit c936a72bb3030c821243c34720fba4327af58631 Author: daylight Date: Fri Nov 1 17:47:16 2024 +0300 Update dist/README.md commit b5aaec47b38b584deaa0e3b6351b0f5a8f1f286f Author: daylight Date: Fri Nov 1 17:46:53 2024 +0300 Update release head commit be2da15508c0c34bb5e6319a32e7c06522a923a7 Author: daylight Date: Fri Nov 1 17:46:37 2024 +0300 Update links in readme commit 3019dfc37a5eb8acc52d55fb1b5f218be6a30694 Author: daylight Date: Fri Nov 1 17:46:16 2024 +0300 Update contributing guide commit 3b9333dbd8e69e8a2eecdb77113082caa307e0ad Author: daylight Date: Fri Nov 1 17:45:53 2024 +0300 Update CI commit 2831a0d0fddf3c9b397addda91c4a6d4ae3b2b50 Author: daylight Date: Fri Nov 1 17:45:31 2024 +0300 Update config Revert "Update CI" This reverts commit 3b9333dbd8e69e8a2eecdb77113082caa307e0ad. --- .github/workflows/main.yml | 92 ++++++++++++++++++-------------------- 1 file changed, 43 insertions(+), 49 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 503c7ac54..5ce7af121 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -1,13 +1,15 @@ name: uBO release on: - workflow_dispatch: create: branches: master permissions: contents: read +# I used the following project as template to get started: +# https://github.com/dessant/search-by-image/blob/master/.github/workflows/ci.yml + jobs: build: permissions: @@ -16,81 +18,73 @@ jobs: runs-on: ubuntu-latest if: startsWith(github.ref, 'refs/tags/') steps: - - name: Checkout repository + - name: Clone repository uses: actions/checkout@v4 with: persist-credentials: false - - - name: Checkout uAssets repository + - name: Clone uAssets run: | tools/pull-assets.sh - + # https://www.gnu.org/software/bash/manual/html_node/Shell-Parameter-Expansion.html - name: Get release information id: release_info run: | - echo "VERSION=${GITHUB_REF/refs\/tags\//}" >> $GITHUB_ENV - + echo ::set-output name=VERSION::${GITHUB_REF/refs\/tags\//} - name: Assemble release notes run: | > release.body.txt grep -m1 -B10000 -- "----------" CHANGELOG.md >> release.body.txt - sed -e 's/%version%/'"$VERSION"'/g' RELEASE.HEAD.md >> release.body.txt - - - name: Build MV2 packages - run: | - tools/make-chromium.sh $VERSION - tools/make-firefox.sh $VERSION - tools/make-thunderbird.sh $VERSION - tools/make-npm.sh $VERSION - + sed -e 's/%version%/${{ steps.release_info.outputs.VERSION }}/g' RELEASE.HEAD.md >> release.body.txt - name: Create GitHub release id: create_release - uses: softprops/action-gh-release@v2 + uses: actions/create-release@v1 + env: + GITHUB_TOKEN: ${{ github.token }} with: - tag_name: ${{ env.VERSION }} - release_name: ${{ env.VERSION }} + tag_name: ${{ steps.release_info.outputs.VERSION }} + release_name: ${{ steps.release_info.outputs.VERSION }} draft: true prerelease: true body_path: release.body.txt - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - + - name: Build MV2 packages + run: | + tools/make-chromium.sh ${{ steps.release_info.outputs.VERSION }} + tools/make-firefox.sh ${{ steps.release_info.outputs.VERSION }} + tools/make-thunderbird.sh ${{ steps.release_info.outputs.VERSION }} + tools/make-npm.sh ${{ steps.release_info.outputs.VERSION }} - name: Upload Chromium package - uses: softprops/action-gh-release@v2 - with: - upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: dist/build/uBlock0_${{ env.VERSION }}.chromium.zip - asset_name: uBlock0_${{ env.VERSION }}.chromium.zip - asset_content_type: application/octet-stream + uses: actions/upload-release-asset@v1 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - + with: + upload_url: ${{ steps.create_release.outputs.upload_url }} + asset_path: dist/build/uBlock0_${{ steps.release_info.outputs.VERSION }}.chromium.zip + asset_name: uBlock0_${{ steps.release_info.outputs.VERSION }}.chromium.zip + asset_content_type: application/octet-stream - name: Upload Firefox package - uses: softprops/action-gh-release@v2 - with: - upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: dist/build/uBlock0_${{ env.VERSION }}.firefox.xpi - asset_name: uBlock0_${{ env.VERSION }}.firefox.xpi - asset_content_type: application/octet-stream + uses: actions/upload-release-asset@v1 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - + with: + upload_url: ${{ steps.create_release.outputs.upload_url }} + asset_path: dist/build/uBlock0_${{ steps.release_info.outputs.VERSION }}.firefox.xpi + asset_name: uBlock0_${{ steps.release_info.outputs.VERSION }}.firefox.xpi + asset_content_type: application/octet-stream - name: Upload Thunderbird package - uses: softprops/action-gh-release@v2 - with: - upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: dist/build/uBlock0_${{ env.VERSION }}.thunderbird.xpi - asset_name: uBlock0_${{ env.VERSION }}.thunderbird.xpi - asset_content_type: application/octet-stream + uses: actions/upload-release-asset@v1 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - + with: + upload_url: ${{ steps.create_release.outputs.upload_url }} + asset_path: dist/build/uBlock0_${{ steps.release_info.outputs.VERSION }}.thunderbird.xpi + asset_name: uBlock0_${{ steps.release_info.outputs.VERSION }}.thunderbird.xpi + asset_content_type: application/octet-stream - name: Upload NodeJS package - uses: softprops/action-gh-release@v2 - with: - upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: dist/build/uBlock0_${{ env.VERSION }}.npm.tgz - asset_name: uBlock0_${{ env.VERSION }}.npm.tgz - asset_content_type: application/octet-stream + uses: actions/upload-release-asset@v1 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + upload_url: ${{ steps.create_release.outputs.upload_url }} + asset_path: dist/build/uBlock0_${{ steps.release_info.outputs.VERSION }}.npm.tgz + asset_name: uBlock0_${{ steps.release_info.outputs.VERSION }}.npm.tgz + asset_content_type: application/octet-stream