diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index dfc02b513..8cdd8ad19 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -58,8 +58,8 @@ jobs: runs-on: ubuntu-latest needs: [debug-inputs] steps: - - - uses: actions/checkout@v4 + - name: Checkout repository + uses: actions/checkout@v4 with: submodules: recursive token: ${{ secrets.DEPLOY_KEY }} @@ -95,17 +95,18 @@ jobs: version: ${{ steps.data.outputs.version }} build_time: ${{ steps.data.outputs.buildtime }} steps: - - name: Install Node.js - uses: actions/setup-node@v3 - with: - node-version: 20 - - - uses: actions/checkout@v4 + - name: Checkout repository + uses: actions/checkout@v4 with: submodules: recursive token: ${{ secrets.DEPLOY_KEY }} - - name: Install pnpm + - name: Setup Node.js + uses: actions/setup-node@v4 + with: + node-version: 20 + + - name: Setup pnpm run: npm install -g pnpm - name: Get pnpm store directory @@ -146,7 +147,8 @@ jobs: echo "version=$(surfer get version | xargs)" >> $GITHUB_OUTPUT echo "buildtime=$(date +"%H:%M:%S")" >> $GITHUB_OUTPUT - - uses: stefanzweifel/git-auto-commit-action@v4 + - name: Commit + uses: stefanzweifel/git-auto-commit-action@v5 if: ${{ inputs.update_version }} with: commit_message: 🔖 Update version to ${{ steps.data.outputs.version }} @@ -157,17 +159,18 @@ jobs: runs-on: ubuntu-latest needs: [build-data] steps: - - name: Install Node.js - uses: actions/setup-node@v3 - with: - node-version: 20 - - - uses: actions/checkout@v4 + - name: Checkout repository + uses: actions/checkout@v4 with: submodules: recursive token: ${{ secrets.DEPLOY_KEY }} - - name: Install pnpm + - name: Setup Node.js + uses: actions/setup-node@v4 + with: + node-version: 20 + + - name: Setup pnpm run: npm install -g pnpm - name: Get pnpm store directory @@ -208,22 +211,23 @@ jobs: needs: [build-data, check-release] steps: - - name: Install Node.js - uses: actions/setup-node@v3 - with: - node-version: 20 - - - uses: actions/checkout@v4 + - name: Checkout repository + uses: actions/checkout@v4 with: submodules: recursive token: ${{ secrets.DEPLOY_KEY }} - - name: Setup git + - name: Setup Node.js + uses: actions/setup-node@v4 + with: + node-version: 20 + + - name: Setup Git run: | git config --global user.email "mauro-balades@users.noreply.github.com" git config --global user.name "mauro-balades" - - name: Install pnpm + - name: Setup pnpm run: npm install -g pnpm - name: Get pnpm store directory @@ -239,7 +243,7 @@ jobs: - name: Load surfer CI setup run: pnpm surfer ci --brand ${{ inputs.update_branch }} --display-version ${{ needs.build-data.outputs.version }} - - name: Download firefox source and dependancies + - name: Download Firefox source and dependencies run: pnpm surfer download --verbose - name: Import @@ -252,7 +256,7 @@ jobs: tar --use-compress-program=zstd -hcf ../zen.source.tar.gz * cd .. - - name: Upload artifact + - name: Upload build artifact uses: actions/upload-artifact@v4 with: name: zen.source.tar.gz @@ -327,23 +331,24 @@ jobs: arch: [x86_64, x86_64-v3, aarch64] needs: [linux] steps: - - name: Install Node.js - uses: actions/setup-node@v3 - with: - node-version: 20 - - - uses: actions/checkout@v4 + - name: Checkout repository + uses: actions/checkout@v4 with: submodules: recursive token: ${{ secrets.DEPLOY_KEY }} + - name: Setup Node.js + uses: actions/setup-node@v4 + with: + node-version: 20 + - name: Install dependencies run: | npm install -g pnpm sudo apt-get update sudo apt-get -y install libfuse2 desktop-file-utils appstream - - name: Download linux build + - name: Download Linux build uses: actions/download-artifact@v4 with: name: zen.linux-${{ matrix.arch == 'x86_64' && 'generic' || matrix.arch == 'x86_64-v3' && 'specific' || matrix.arch == 'aarch64' && 'aarch64' }}.tar.bz2 @@ -376,13 +381,13 @@ jobs: mkdir dist mv zen*AppImage* dist/. - - name: Upload artifact + - name: Upload build artifact uses: actions/upload-artifact@v4 with: name: zen-${{ matrix.arch == 'x86_64' && 'generic' || matrix.arch == 'x86_64-v3' && 'specific' || matrix.arch == 'aarch64' && 'aarch64' }}.AppImage path: ./dist/zen-${{ matrix.arch == 'x86_64' && 'generic' || matrix.arch == 'x86_64-v3' && 'specific' || matrix.arch == 'aarch64' && 'aarch64' }}.AppImage - - name: Upload artifact (ZSync) + - name: Upload build artifact (ZSync) uses: actions/upload-artifact@v4 with: name: zen-${{ matrix.arch == 'x86_64' && 'generic' || matrix.arch == 'x86_64-v3' && 'specific' || matrix.arch == 'aarch64' && 'aarch64' }}.AppImage.zsync @@ -398,21 +403,23 @@ jobs: name: ${{ inputs.update_branch == 'alpha' && 'Deploy-Release' || 'Deploy-Twilight' }} steps: - - uses: actions/checkout@v4 + - name: Checkout repository + uses: actions/checkout@v4 with: submodules: recursive token: ${{ secrets.DEPLOY_KEY }} - - name: Git Pull + - name: Git pull run: | git pull - - uses: actions/download-artifact@v4 + - name: Download artifact + uses: actions/download-artifact@v4 - name: List run: find . - - name: Clone updates repo + - name: Checkout updates repository uses: actions/checkout@v4 with: repository: zen-browser/updates-server @@ -446,7 +453,8 @@ jobs: cp -a ../macos_update_manifest_aarch64/. updates/ cp -a ../macos_update_manifest_x86_64/. updates/ - - uses: stefanzweifel/git-auto-commit-action@v4 + - name: Commit + uses: stefanzweifel/git-auto-commit-action@v4 with: commit_message: 🚀 Update update manifests commit_user_name: Zen Browser Robot @@ -456,7 +464,7 @@ jobs: # If we are on twilight, we want to just update the twilight tag's release - name: Update twilight tag if: ${{ inputs.update_branch == 'twilight' }} - uses: 'marvinpinto/action-automatic-releases@latest' + uses: marvinpinto/action-automatic-releases@master with: files: | zen.source.tar.gz @@ -493,8 +501,8 @@ jobs: env: GITHUB_REPOSITORY: ${{ github.repository }} - - name: release-github - uses: 'marvinpinto/action-automatic-releases@latest' + - name: Release + uses: marvinpinto/action-automatic-releases@master if: ${{ inputs.update_branch == 'alpha' }} with: repo_token: '${{ secrets.DEPLOY_KEY }}' @@ -537,7 +545,7 @@ jobs: runs-on: ubuntu-latest steps: - - name: Clone flatpak repo + - name: Checkout Flatpak repository uses: actions/checkout@v4 with: repository: zen-browser/release-utils @@ -549,18 +557,19 @@ jobs: sudo apt-get update npm install - - name: Generate new flatpak release + - name: Generate new Flatpak release run: | npm run build-flatpak -- \ --version ${{ needs.build-data.outputs.version }} - - uses: stefanzweifel/git-auto-commit-action@v4 + - name: Commit + uses: stefanzweifel/git-auto-commit-action@v4 with: - commit_message: 🚀 Update releases for flatpak + commit_message: 🚀 Update releases for Flatpak commit_user_name: Zen Browser Robot commit_user_email: zen-browser-bot@users.noreply.github.com - - name: Clone flatpak repo + - name: Checkout Flatpak repository uses: actions/checkout@v4 with: repository: zen-browser/flatpak @@ -576,9 +585,10 @@ jobs: # output the version to the file echo -n ${{ needs.build-data.outputs.version }} > ./flatpak/version - - uses: stefanzweifel/git-auto-commit-action@v4 + - name: Commit + uses: stefanzweifel/git-auto-commit-action@v4 with: - commit_message: '[release]: Update flatpak manifest' + commit_message: '[release]: Update Flatpak manifest' commit_user_name: Zen Browser Robot commit_user_email: zen-browser-bot@users.noreply.github.com repository: ./flatpak @@ -594,33 +604,33 @@ jobs: runs-on: ubuntu-latest steps: - - name: Clone flatpak repo + - name: Checkout Flatpak repository uses: actions/checkout@v4 with: repository: flathub/io.github.zen_browser.zen token: ${{ secrets.DEPLOY_KEY }} - - name: Download linux generic build + - name: Download Linux generic build uses: actions/download-artifact@v4 with: name: zen.linux-generic.tar.bz2 - - name: Update repo + - name: Update repository uses: actions/checkout@v4 with: path: zen-browser token: ${{ secrets.DEPLOY_KEY }} - - name: Download flatpak archive + - name: Download Flatpak archive run: | wget https://github.com/zen-browser/flatpak/releases/latest/download/archive.tar -O archive.tar - - name: Setup git + - name: Setup Git run: | git config --global user.name "github-actions[bot]" git config --global user.email "github-actions[bot]@users.noreply.github.com" - - name: Prepare flatpak manifest + - name: Prepare Flatpak manifest run: | python3 ./zen-browser/scripts/prepare-flatpak-release.py \ --flatpak-archive archive.tar \ @@ -640,14 +650,14 @@ jobs: rm -rf archive.tar rm -rf zen.linux-generic.tar.bz2 - - name: Upload flatpak manifest + - name: Upload Flatpak manifest uses: actions/upload-artifact@v4 with: name: io.github.zen_browser.zen.yml path: ./io.github.zen_browser.zen.yml - name: Create pull request - uses: peter-evans/create-pull-request@v6 + uses: peter-evans/create-pull-request@v7 env: GIT_TRACE: 1 GIT_CURL_VERBOSE: 1 @@ -672,13 +682,13 @@ jobs: runs-on: macos-latest steps: - - name: Set up Homebrew + - name: Setup Homebrew uses: Homebrew/actions/setup-homebrew@master with: cask: true test-bot: false - - name: Setup git + - name: Setup Git uses: Homebrew/actions/git-user-config@master with: username: zen-browser-bot