From 50b579ed4fcc356079e7b2431d67817ccf0a6df6 Mon Sep 17 00:00:00 2001 From: Hazel Date: Thu, 5 Oct 2023 14:48:54 +0100 Subject: [PATCH 1/7] attempt using PAT for submodule checkout --- .github/workflows/build-shit.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build-shit.yml b/.github/workflows/build-shit.yml index ed509b44d..0d9f1f2a4 100644 --- a/.github/workflows/build-shit.yml +++ b/.github/workflows/build-shit.yml @@ -26,6 +26,7 @@ jobs: - uses: actions/checkout@v3 with: submodules: 'recursive' + token: ${{ secrets.GH_RO_PAT }} - uses: ./.github/actions/setup-haxeshit - name: Build game run: | @@ -48,6 +49,7 @@ jobs: - uses: actions/checkout@v3 with: submodules: 'recursive' + token: ${{ secrets.GH_RO_PAT }} - uses: ./.github/actions/setup-haxeshit - name: Build game run: | From 572dfb26564918e05430a815a0dfd0b98e79d835 Mon Sep 17 00:00:00 2001 From: Hazel Date: Thu, 5 Oct 2023 14:57:02 +0100 Subject: [PATCH 2/7] apt update --- .github/workflows/build-shit.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build-shit.yml b/.github/workflows/build-shit.yml index 0d9f1f2a4..e3dd51661 100644 --- a/.github/workflows/build-shit.yml +++ b/.github/workflows/build-shit.yml @@ -30,6 +30,7 @@ jobs: - uses: ./.github/actions/setup-haxeshit - name: Build game run: | + sudo apt-get update sudo apt-get install -y libx11-dev xorg-dev libgl-dev libxi-dev libxext-dev libasound2-dev libxinerama-dev libxrandr-dev libgl1-mesa-dev haxelib run lime build html5 -release --times ls From 6d7df09437c02e28c84870be64190538abe91609 Mon Sep 17 00:00:00 2001 From: Hazel Date: Thu, 5 Oct 2023 15:34:01 +0100 Subject: [PATCH 3/7] missed a checkout for unit tests --- .github/workflows/build-shit.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build-shit.yml b/.github/workflows/build-shit.yml index e3dd51661..0e365b281 100644 --- a/.github/workflows/build-shit.yml +++ b/.github/workflows/build-shit.yml @@ -71,6 +71,7 @@ jobs: - uses: actions/checkout@v3 with: submodules: 'recursive' + token: ${{ secrets.GH_RO_PAT }} - uses: ./.github/actions/setup-haxeshit - name: Run unit tests run: | From 66e9bf8716e2741296fedada929ec86ff0571428 Mon Sep 17 00:00:00 2001 From: Hazel Date: Thu, 5 Oct 2023 15:41:37 +0100 Subject: [PATCH 4/7] 64fast --- .github/workflows/build-shit.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-shit.yml b/.github/workflows/build-shit.yml index 0e365b281..ab96ec9a3 100644 --- a/.github/workflows/build-shit.yml +++ b/.github/workflows/build-shit.yml @@ -42,7 +42,7 @@ jobs: create-nightly-win: needs: check_date if: ${{ needs.check_date.outputs.should_run != 'false'}} - runs-on: windows-latest + runs-on: 64fast permissions: contents: write actions: write @@ -63,7 +63,7 @@ jobs: target: win test-unit-win: needs: create-nightly-win - runs-on: windows-latest + runs-on: 64fast permissions: contents: write actions: write From 1e72c3d60065583421cd0a3779096185a9387c95 Mon Sep 17 00:00:00 2001 From: Hazel Date: Thu, 5 Oct 2023 15:54:13 +0100 Subject: [PATCH 5/7] 64fast is not worth it --- .github/actions/upload-itch/action.yml | 4 ++-- .github/workflows/build-shit.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/actions/upload-itch/action.yml b/.github/actions/upload-itch/action.yml index 5abc31b16..af9a87b39 100644 --- a/.github/actions/upload-itch/action.yml +++ b/.github/actions/upload-itch/action.yml @@ -36,9 +36,9 @@ runs: ./butler -V shell: bash - name: Upload game to itch.io - env: + env: BUTLER_API_KEY: ${{inputs.butler-key}} run: | ./butler login ./butler push ${{inputs.build-dir}} ninja-muffin24/funkin-secret:${{inputs.target}}-${GITHUB_REF##*/} - shell: bash \ No newline at end of file + shell: bash diff --git a/.github/workflows/build-shit.yml b/.github/workflows/build-shit.yml index ab96ec9a3..0e365b281 100644 --- a/.github/workflows/build-shit.yml +++ b/.github/workflows/build-shit.yml @@ -42,7 +42,7 @@ jobs: create-nightly-win: needs: check_date if: ${{ needs.check_date.outputs.should_run != 'false'}} - runs-on: 64fast + runs-on: windows-latest permissions: contents: write actions: write @@ -63,7 +63,7 @@ jobs: target: win test-unit-win: needs: create-nightly-win - runs-on: 64fast + runs-on: windows-latest permissions: contents: write actions: write From af65b83ddd090c49b5884fa2e740c64511d2f30f Mon Sep 17 00:00:00 2001 From: Hazel Date: Thu, 5 Oct 2023 15:55:23 +0100 Subject: [PATCH 6/7] remove --quiet so i can see errors (woah) --- .github/actions/setup-haxeshit/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/setup-haxeshit/action.yml b/.github/actions/setup-haxeshit/action.yml index 38a504442..e96181ce4 100644 --- a/.github/actions/setup-haxeshit/action.yml +++ b/.github/actions/setup-haxeshit/action.yml @@ -16,5 +16,5 @@ runs: haxelib git haxelib https://github.com/HaxeFoundation/haxelib.git development haxelib version haxelib --global install hmm - haxelib --global run hmm install --quiet + haxelib --global run hmm install shell: bash From 2e97bb2d7b94c50e9dc15a75b500ffbad7e05527 Mon Sep 17 00:00:00 2001 From: Hazel Date: Fri, 6 Oct 2023 15:52:28 +0100 Subject: [PATCH 7/7] attempt i. at caching haxe installs --- .github/actions/setup-haxeshit/action.yml | 43 +++++++++++++++-------- 1 file changed, 28 insertions(+), 15 deletions(-) diff --git a/.github/actions/setup-haxeshit/action.yml b/.github/actions/setup-haxeshit/action.yml index e96181ce4..756530178 100644 --- a/.github/actions/setup-haxeshit/action.yml +++ b/.github/actions/setup-haxeshit/action.yml @@ -3,18 +3,31 @@ description: "sets up haxe shit, using HMM!" runs: using: "composite" steps: - - uses: krdlab/setup-haxe@v1.5.1 - with: - haxe-version: 4.3.1 - - name: Config haxelib - run: | - haxelib config - shell: bash - - name: Installing Haxe lol - run: | - haxe -version - haxelib git haxelib https://github.com/HaxeFoundation/haxelib.git development - haxelib version - haxelib --global install hmm - haxelib --global run hmm install - shell: bash + - uses: krdlab/setup-haxe@v1.5.1 + with: + haxe-version: 4.3.1 + - name: Config haxelib + run: | + haxelib config + shell: bash + - name: Installing Haxe lol + run: | + haxe -version + haxelib git haxelib https://github.com/HaxeFoundation/haxelib.git development + haxelib version + haxelib --global install hmm + shell: bash + - name: dependency install cache + id: cache-hmm + uses: actions/cache@v3 + with: + path: .haxelib + key: ${{ runner.os }}-hmm-${{ hashFiles('**/hmm.json') }} + restore-keys: | + ${{ runner.os }}-hmm- + ${{ runner.os }}- + - if: ${{ steps.cache-hmm.outputs.cache-hit != 'true' }} + name: hmm install + run: | + haxelib --global run hmm install + shell: bash