From fb64220b8691a8a840c7bc4b2f2080b0d708eba3 Mon Sep 17 00:00:00 2001 From: mozrokafor <94625718+mozrokafor@users.noreply.github.com> Date: Mon, 19 Dec 2022 22:38:52 -0500 Subject: [PATCH 01/12] adding token to raise api limits --- .github/workflows/wasm.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/wasm.yaml b/.github/workflows/wasm.yaml index e5c75e67ac..5d86702d63 100644 --- a/.github/workflows/wasm.yaml +++ b/.github/workflows/wasm.yaml @@ -125,7 +125,9 @@ jobs: path: wasm - uses: browser-actions/setup-geckodriver@latest - + env: + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + - name: Build addons shell: bash run: ./scripts/addon/generate_all_tests.py -q /opt/$QTVERSION/gcc_64/bin From dc3439ca02467c59d85dc340058fc2183add3aa6 Mon Sep 17 00:00:00 2001 From: mozrokafor <94625718+mozrokafor@users.noreply.github.com> Date: Tue, 20 Dec 2022 17:20:13 -0500 Subject: [PATCH 02/12] update variable --- .github/workflows/wasm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/wasm.yaml b/.github/workflows/wasm.yaml index 5d86702d63..690ebc66ea 100644 --- a/.github/workflows/wasm.yaml +++ b/.github/workflows/wasm.yaml @@ -126,7 +126,7 @@ jobs: - uses: browser-actions/setup-geckodriver@latest env: - GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + token: ${{ secrets.GITHUB_TOKEN }} - name: Build addons shell: bash From 89870ba336c7b20682cbe4a94a7b8e03243a5a9d Mon Sep 17 00:00:00 2001 From: mozrokafor <94625718+mozrokafor@users.noreply.github.com> Date: Tue, 20 Dec 2022 17:43:47 -0500 Subject: [PATCH 03/12] update cache mechanism --- .github/workflows/wasm.yaml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/.github/workflows/wasm.yaml b/.github/workflows/wasm.yaml index 690ebc66ea..994b6c955c 100644 --- a/.github/workflows/wasm.yaml +++ b/.github/workflows/wasm.yaml @@ -124,7 +124,16 @@ jobs: # Destination path path: wasm - - uses: browser-actions/setup-geckodriver@latest + - name: Cache geckodriver + id: cache-gecko + uses: actions/cache@v3 + with: + path: geckodriver/ + key: geckodriver-v0.32.0 + + - name: Set up gecko driver + if: steps.cache-gecko.outputs.cache-hit != 'true' + uses: browser-actions/setup-geckodriver@0.32.0 env: token: ${{ secrets.GITHUB_TOKEN }} From bf0a49d4b0d9df4ac5eb6b07545f26b38d83deb7 Mon Sep 17 00:00:00 2001 From: mozrokafor <94625718+mozrokafor@users.noreply.github.com> Date: Tue, 20 Dec 2022 17:58:24 -0500 Subject: [PATCH 04/12] use latest --- .github/workflows/wasm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/wasm.yaml b/.github/workflows/wasm.yaml index 994b6c955c..f77599b845 100644 --- a/.github/workflows/wasm.yaml +++ b/.github/workflows/wasm.yaml @@ -133,7 +133,7 @@ jobs: - name: Set up gecko driver if: steps.cache-gecko.outputs.cache-hit != 'true' - uses: browser-actions/setup-geckodriver@0.32.0 + uses: browser-actions/setup-geckodriver@0latest env: token: ${{ secrets.GITHUB_TOKEN }} From db49506bc51ce6cc129633f4da9fb147a92110ad Mon Sep 17 00:00:00 2001 From: mozrokafor <94625718+mozrokafor@users.noreply.github.com> Date: Tue, 20 Dec 2022 18:41:14 -0500 Subject: [PATCH 05/12] typo --- .github/workflows/wasm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/wasm.yaml b/.github/workflows/wasm.yaml index f77599b845..b252d36d76 100644 --- a/.github/workflows/wasm.yaml +++ b/.github/workflows/wasm.yaml @@ -133,7 +133,7 @@ jobs: - name: Set up gecko driver if: steps.cache-gecko.outputs.cache-hit != 'true' - uses: browser-actions/setup-geckodriver@0latest + uses: browser-actions/setup-geckodriver@latest env: token: ${{ secrets.GITHUB_TOKEN }} From 4899881bfed497aef36a3481ab87e5ae16abb454 Mon Sep 17 00:00:00 2001 From: mozrokafor <94625718+mozrokafor@users.noreply.github.com> Date: Tue, 20 Dec 2022 20:11:36 -0500 Subject: [PATCH 06/12] updated path and key --- .github/workflows/wasm.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/wasm.yaml b/.github/workflows/wasm.yaml index b252d36d76..244c0e041f 100644 --- a/.github/workflows/wasm.yaml +++ b/.github/workflows/wasm.yaml @@ -128,8 +128,8 @@ jobs: id: cache-gecko uses: actions/cache@v3 with: - path: geckodriver/ - key: geckodriver-v0.32.0 + path: ~/opt/hostedtoolcache/geckodriver/0.32.0/x64 + key: geckodriver 0.32.0 - name: Set up gecko driver if: steps.cache-gecko.outputs.cache-hit != 'true' From 94c20f9585071bf33bb05997ab0be6bff0c4a77d Mon Sep 17 00:00:00 2001 From: mozrokafor <94625718+mozrokafor@users.noreply.github.com> Date: Tue, 20 Dec 2022 20:27:26 -0500 Subject: [PATCH 07/12] wip --- .github/workflows/wasm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/wasm.yaml b/.github/workflows/wasm.yaml index 244c0e041f..a5722f3157 100644 --- a/.github/workflows/wasm.yaml +++ b/.github/workflows/wasm.yaml @@ -128,7 +128,7 @@ jobs: id: cache-gecko uses: actions/cache@v3 with: - path: ~/opt/hostedtoolcache/geckodriver/0.32.0/x64 + path: ~/opt/hostedtoolcache/geckodriver/0.32.0/x64/ key: geckodriver 0.32.0 - name: Set up gecko driver From 8673edb6db27f50dd7d220315718088c4b74391d Mon Sep 17 00:00:00 2001 From: mozrokafor <94625718+mozrokafor@users.noreply.github.com> Date: Tue, 20 Dec 2022 20:59:20 -0500 Subject: [PATCH 08/12] wip --- .github/workflows/wasm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/wasm.yaml b/.github/workflows/wasm.yaml index a5722f3157..6ccf0ffb1f 100644 --- a/.github/workflows/wasm.yaml +++ b/.github/workflows/wasm.yaml @@ -128,7 +128,7 @@ jobs: id: cache-gecko uses: actions/cache@v3 with: - path: ~/opt/hostedtoolcache/geckodriver/0.32.0/x64/ + path: ./opt/hostedtoolcache/geckodriver/0.32.0/x64/ key: geckodriver 0.32.0 - name: Set up gecko driver From 5718a78b315f174cf0a81d26dd5aa01e8a6625af Mon Sep 17 00:00:00 2001 From: mozrokafor <94625718+mozrokafor@users.noreply.github.com> Date: Tue, 20 Dec 2022 22:03:24 -0500 Subject: [PATCH 09/12] wip --- .github/workflows/wasm.yaml | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/.github/workflows/wasm.yaml b/.github/workflows/wasm.yaml index 6ccf0ffb1f..b6ae3a1a55 100644 --- a/.github/workflows/wasm.yaml +++ b/.github/workflows/wasm.yaml @@ -123,19 +123,11 @@ jobs: name: WebAssembly Build Qt6 # Destination path path: wasm - - - name: Cache geckodriver - id: cache-gecko - uses: actions/cache@v3 - with: - path: ./opt/hostedtoolcache/geckodriver/0.32.0/x64/ - key: geckodriver 0.32.0 - + - name: Set up gecko driver - if: steps.cache-gecko.outputs.cache-hit != 'true' uses: browser-actions/setup-geckodriver@latest env: - token: ${{ secrets.GITHUB_TOKEN }} + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Build addons shell: bash From eccb3a6da4fd315a4321a404b8dea42931d771cf Mon Sep 17 00:00:00 2001 From: mozrokafor <94625718+mozrokafor@users.noreply.github.com> Date: Tue, 20 Dec 2022 22:40:51 -0500 Subject: [PATCH 10/12] revert back to gh_token --- .github/workflows/wasm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/wasm.yaml b/.github/workflows/wasm.yaml index b6ae3a1a55..27b2cca389 100644 --- a/.github/workflows/wasm.yaml +++ b/.github/workflows/wasm.yaml @@ -127,7 +127,7 @@ jobs: - name: Set up gecko driver uses: browser-actions/setup-geckodriver@latest env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Build addons shell: bash From 18001c7a1129401ae4ec40384a40473fbedbfefe Mon Sep 17 00:00:00 2001 From: mozrokafor <94625718+mozrokafor@users.noreply.github.com> Date: Tue, 20 Dec 2022 22:57:48 -0500 Subject: [PATCH 11/12] relocate gecko setup --- .github/workflows/wasm.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/wasm.yaml b/.github/workflows/wasm.yaml index 27b2cca389..a00393cc58 100644 --- a/.github/workflows/wasm.yaml +++ b/.github/workflows/wasm.yaml @@ -45,6 +45,11 @@ jobs: - name: Setup emsdk uses: mymindstorm/setup-emsdk@v7 + - name: Set up gecko driver + uses: browser-actions/setup-geckodriver@latest + env: + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + - name: Compiling shell: bash run: | @@ -122,12 +127,7 @@ jobs: with: name: WebAssembly Build Qt6 # Destination path - path: wasm - - - name: Set up gecko driver - uses: browser-actions/setup-geckodriver@latest - env: - GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + path: wasm - name: Build addons shell: bash From a80563b3844542f94b7992ab0a3ce471d43dc81e Mon Sep 17 00:00:00 2001 From: mozrokafor <94625718+mozrokafor@users.noreply.github.com> Date: Tue, 20 Dec 2022 23:21:21 -0500 Subject: [PATCH 12/12] revert gh_token use --- .github/workflows/wasm.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/wasm.yaml b/.github/workflows/wasm.yaml index a00393cc58..de1f8db7c5 100644 --- a/.github/workflows/wasm.yaml +++ b/.github/workflows/wasm.yaml @@ -47,8 +47,6 @@ jobs: - name: Set up gecko driver uses: browser-actions/setup-geckodriver@latest - env: - GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Compiling shell: bash