From e72d474eca61478ae5ea602699826be482a35aaf Mon Sep 17 00:00:00 2001 From: Ryosuke Asano Date: Fri, 15 Mar 2024 11:37:39 +0900 Subject: [PATCH] [FB] Workflow | Add Personal access token to deployment --- .github/workflows/daily-build-with-update.yml | 17 ++++++++++++- .github/workflows/deployments.yml | 24 ++++++++++++++++++- .github/workflows/linux-build.yml | 1 + .github/workflows/linux-x64-deb.yml | 2 ++ .github/workflows/macOS-Universal.yml | 1 + ...macOS-generate-profile-data-and-jarlog.yml | 1 + .github/workflows/macOS-integration.yml | 1 + ...indow-generate-profile-data-and-jarlog.yml | 3 ++- .github/workflows/windows-build.yml | 1 + .github/workflows/wrapper_linux-build.yml | 2 ++ .github/workflows/wrapper_windows-build.yml | 2 ++ 11 files changed, 52 insertions(+), 3 deletions(-) diff --git a/.github/workflows/daily-build-with-update.yml b/.github/workflows/daily-build-with-update.yml index d8e2e9a7d7d26..13e8339a29e4f 100644 --- a/.github/workflows/daily-build-with-update.yml +++ b/.github/workflows/daily-build-with-update.yml @@ -29,6 +29,7 @@ jobs: steps: - uses: actions/checkout@v4 with: + token: ${{ secrets.PAT }} sparse-checkout: 'browser/config/version_display.txt' - name: Get Display Version id: get @@ -42,6 +43,7 @@ jobs: steps: - uses: actions/checkout@v4 with: + token: ${{ secrets.PAT }} sparse-checkout: 'browser/config/version.txt' - name: Get Inside Version id: get @@ -69,13 +71,17 @@ jobs: profgen: true aarch64: false zstd: true - + secrets: + token: ${{ secrets.PAT }} + Part2-win-x86_64-gen-profdata-and-jarlog: needs: Part1-win-x86_64-build-with-profgen-zstd uses: ./.github/workflows/window-generate-profile-data-and-jarlog.yml with: browser-artifact-name: floorp-windows-x86_64-build-with-profgen-zstd arch: x86_64 + secrets: + token: ${{ secrets.PAT }} Part3-win-x86_64-build-with-profdata-and-jarlog: needs: [Part2-win-x86_64-gen-profdata-and-jarlog, get-buildid] @@ -87,6 +93,8 @@ jobs: profdata_jarlog_artifact_name: "floorp-windows-x86_64-profdata-and-jarlog" out_artifact_name: please-use-this-floorp-windows-x86_64-package-build-with-profdata-and-jarlog MOZ_BUILD_DATE: ${{needs.get-buildid.outputs.buildids}} + secrets: + token: ${{ secrets.PAT }} Part4-win-x86_64-gen-update-xml: needs: [get-display-version, get-buildid, get-inside-version, Part3-win-x86_64-build-with-profdata-and-jarlog] @@ -135,6 +143,8 @@ jobs: beta: true mar: true MOZ_BUILD_DATE: ${{needs.get-buildid.outputs.buildids}} + secrets: + token: ${{ secrets.PAT }} Part2-linux-x86_64-gen-update-xml: runs-on: 'ubuntu-latest' @@ -181,10 +191,13 @@ jobs: profgen: true secrets: MACOS_CROSS_TOOLS_KEY: ${{ secrets.MACOS_CROSS_TOOLS_KEY }} + token: ${{ secrets.PAT }} Part2-macOS-Universal-gen-profdata-and-jarlog: uses: ./.github/workflows/macOS-generate-profile-data-and-jarlog.yml needs: Part1-macOS-Universal-build-with-profgen + secrets: + token: ${{ secrets.PAT }} Part3-macOS-Universal-build-with-profdata-and-jarlog: uses: ./.github/workflows/macOS-Universal.yml @@ -195,6 +208,7 @@ jobs: MOZ_BUILD_DATE: ${{needs.get-buildid.outputs.buildids}} secrets: MACOS_CROSS_TOOLS_KEY: ${{ secrets.MACOS_CROSS_TOOLS_KEY }} + token: ${{ secrets.PAT }} Part4-macOS-Universal-package-and-sign: uses: ./.github/workflows/macOS-integration.yml @@ -214,6 +228,7 @@ jobs: macOS_AppleAccountId: ${{ secrets.macOS_AppleAccountId }} macOS_AppleTeamId: ${{ secrets.macOS_AppleTeamId }} macOS_AppleAccountAppSpecificPassword: ${{ secrets.macOS_AppleAccountAppSpecificPassword }} + token: ${{ secrets.PAT }} ##################################################################### Deployments ####################################################################################################### Deployments: diff --git a/.github/workflows/deployments.yml b/.github/workflows/deployments.yml index 12c3d1c46e35a..1ace6bd880e72 100644 --- a/.github/workflows/deployments.yml +++ b/.github/workflows/deployments.yml @@ -36,6 +36,7 @@ jobs: steps: - uses: actions/checkout@v4 with: + token: ${{ secrets.PAT }} sparse-checkout: 'browser/config/version_display.txt' - name: Get Display Version id: get @@ -49,6 +50,7 @@ jobs: steps: - uses: actions/checkout@v4 with: + token: ${{ secrets.PAT }} sparse-checkout: 'browser/config/version.txt' - name: Get Inside Version id: get @@ -77,6 +79,8 @@ jobs: profgen: true aarch64: false zstd: true + secrets: + token: ${{ secrets.PAT }} Part2-win-x86_64-gen-profdata-and-jarlog: needs: Part1-win-x86_64-build-with-profgen-zstd @@ -84,6 +88,8 @@ jobs: with: browser-artifact-name: floorp-windows-x86_64-build-with-profgen-zstd arch: x86_64 + secrets: + token: ${{ secrets.PAT }} Part3-win-x86_64-build-with-profdata-and-jarlog: needs: [Part2-win-x86_64-gen-profdata-and-jarlog, get-buildid] @@ -96,6 +102,8 @@ jobs: MOZ_BUILD_DATE: ${{needs.get-buildid.outputs.buildids}} release-note-url: ${{ inputs.release-note-url }} release-note-url-ja: ${{ inputs.release-note-url-ja }} + secrets: + token: ${{ secrets.PAT }} ################################################################ ↑ Windows x86_64 Build ################################################################################### @@ -106,6 +114,8 @@ jobs: aarch64: false build32bit: true zstd: true + secrets: + token: ${{ secrets.PAT }} Part2-win-x86-gen-profdata-and-jarlog: needs: Part1-win-x86-build-with-profgen-zstd @@ -113,7 +123,9 @@ jobs: with: browser-artifact-name: floorp-windows-x86-build-with-profgen-zstd arch: x86 - + secrets: + token: ${{ secrets.PAT }} + Part3-win-x86-build-with-profdata-and-jarlog: needs: [get-buildid, Part2-win-x86-gen-profdata-and-jarlog] uses: ./.github/workflows/windows-build.yml @@ -125,6 +137,8 @@ jobs: MOZ_BUILD_DATE: ${{needs.get-buildid.outputs.buildids}} release-note-url: ${{ inputs.release-note-url }} release-note-url-ja: ${{ inputs.release-note-url-ja }} + secrets: + token: ${{ secrets.PAT }} ################################################################ ↑ Windows x86 Build #################################################################################### @@ -138,6 +152,8 @@ jobs: MOZ_BUILD_DATE: ${{needs.get-buildid.outputs.buildids}} release-note-url: ${{ inputs.release-note-url }} release-note-url-ja: ${{ inputs.release-note-url-ja }} + secrets: + token: ${{ secrets.PAT }} ################################################################ ↑ Linux x86_64 Build #################################################################################### Part1-linux-aarch64-build: @@ -150,6 +166,8 @@ jobs: MOZ_BUILD_DATE: ${{needs.get-buildid.outputs.buildids}} release-note-url: ${{ inputs.release-note-url }} release-note-url-ja: ${{ inputs.release-note-url-ja }} + secrets: + token: ${{ secrets.PAT }} ################################################ ↑ Linux AArch64 Build ################################################ @@ -161,10 +179,13 @@ jobs: profgen: true secrets: MACOS_CROSS_TOOLS_KEY: ${{ secrets.MACOS_CROSS_TOOLS_KEY }} + token: ${{ secrets.PAT }} Part2-macOS-Universal-gen-profdata-and-jarlog: needs: Part1-macOS-Universal-build-with-profgen uses: ./.github/workflows/macOS-generate-profile-data-and-jarlog.yml + secrets: + token: ${{ secrets.PAT }} Part3-macOS-Universal-build-with-profdata-and-jarlog: uses: ./.github/workflows/macOS-Universal.yml @@ -177,6 +198,7 @@ jobs: release-note-url-ja: ${{ inputs.release-note-url-ja }} secrets: MACOS_CROSS_TOOLS_KEY: ${{ secrets.MACOS_CROSS_TOOLS_KEY }} + token: ${{ secrets.PAT }} Part4-macOS-Universal-package-and-sign: uses: ./.github/workflows/macOS-integration.yml diff --git a/.github/workflows/linux-build.yml b/.github/workflows/linux-build.yml index 6f22f7be01e8d..24891089af8a2 100644 --- a/.github/workflows/linux-build.yml +++ b/.github/workflows/linux-build.yml @@ -62,6 +62,7 @@ jobs: - uses: actions/checkout@v4 name: Clone 🧬 with: + token: ${{ secrets.PAT }} submodules: 'recursive' - name: Change PPA mirror servers diff --git a/.github/workflows/linux-x64-deb.yml b/.github/workflows/linux-x64-deb.yml index 480129df8dc06..cd9582e1f9240 100644 --- a/.github/workflows/linux-x64-deb.yml +++ b/.github/workflows/linux-x64-deb.yml @@ -29,6 +29,8 @@ jobs: steps: - name: Checkout 🛎️ uses: actions/checkout@v4 + with: + submodules: 'recursive' - name: Change PPA mirror servers run: | diff --git a/.github/workflows/macOS-Universal.yml b/.github/workflows/macOS-Universal.yml index e4e15e2d846fb..b72cac684287e 100644 --- a/.github/workflows/macOS-Universal.yml +++ b/.github/workflows/macOS-Universal.yml @@ -95,6 +95,7 @@ jobs: name: Clone 🧬 with: submodules: 'recursive' + token: ${{ secrets.PAT }} - name: Setup Disk & Swap Space 💿 run: | diff --git a/.github/workflows/macOS-generate-profile-data-and-jarlog.yml b/.github/workflows/macOS-generate-profile-data-and-jarlog.yml index 1b955ae127ee8..e573b478ba954 100644 --- a/.github/workflows/macOS-generate-profile-data-and-jarlog.yml +++ b/.github/workflows/macOS-generate-profile-data-and-jarlog.yml @@ -27,6 +27,7 @@ jobs: name: Clone 🧬 with: submodules: 'recursive' + token: ${{ secrets.PAT }} - name: Check Arch type shell: bash diff --git a/.github/workflows/macOS-integration.yml b/.github/workflows/macOS-integration.yml index 638c81a7a55f8..f80c60b5e0690 100644 --- a/.github/workflows/macOS-integration.yml +++ b/.github/workflows/macOS-integration.yml @@ -90,6 +90,7 @@ jobs: uses: actions/checkout@v4 with: submodules: 'recursive' + token: ${{ secrets.PAT }} - name: download M1 build artifact 📥 uses: actions/download-artifact@v4 diff --git a/.github/workflows/window-generate-profile-data-and-jarlog.yml b/.github/workflows/window-generate-profile-data-and-jarlog.yml index ad1d1b07d9a40..3b39923c2204c 100644 --- a/.github/workflows/window-generate-profile-data-and-jarlog.yml +++ b/.github/workflows/window-generate-profile-data-and-jarlog.yml @@ -50,7 +50,8 @@ jobs: - uses: actions/checkout@v4 name: Clone 🧬 with: - submodules: 'recursive' + submodules: 'recursive' + token: ${{ secrets.PAT }} - name: Setup 🪛 run: | diff --git a/.github/workflows/windows-build.yml b/.github/workflows/windows-build.yml index 6aa4b95be7278..854a7835e1283 100644 --- a/.github/workflows/windows-build.yml +++ b/.github/workflows/windows-build.yml @@ -117,6 +117,7 @@ jobs: name: Clone 🧬 with: submodules: 'recursive' + token: ${{ secrets.PAT }} - name: Setup Disk & Swap Space 💿 run: | diff --git a/.github/workflows/wrapper_linux-build.yml b/.github/workflows/wrapper_linux-build.yml index 5c92808c5aa21..f25276c33f804 100644 --- a/.github/workflows/wrapper_linux-build.yml +++ b/.github/workflows/wrapper_linux-build.yml @@ -24,3 +24,5 @@ jobs: uses: ./.github/workflows/linux-build.yml with: aarch64: ${{inputs.aarch64}} + secrets: + token: ${{ secrets.PAT }} diff --git a/.github/workflows/wrapper_windows-build.yml b/.github/workflows/wrapper_windows-build.yml index e24a192d4bcba..9559aa4ae9e94 100644 --- a/.github/workflows/wrapper_windows-build.yml +++ b/.github/workflows/wrapper_windows-build.yml @@ -32,3 +32,5 @@ jobs: profgen: ${{inputs.profgen}} aarch64: ${{inputs.aarch64}} build32bit: ${{inputs.bit-32}} + secrets: + token: ${{ secrets.PAT }}