From a1714711e3f85f207b47dab03899543428bce3f1 Mon Sep 17 00:00:00 2001 From: mint Date: Mon, 26 Aug 2024 17:52:37 +0200 Subject: [PATCH 01/10] swap docker image deps --- .github/actions/setup-haxe/action.yml | 5 ++--- .github/workflows/build-game.yml | 1 + build/Dockerfile | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/actions/setup-haxe/action.yml b/.github/actions/setup-haxe/action.yml index b22fc6f69..cf74cfb63 100644 --- a/.github/actions/setup-haxe/action.yml +++ b/.github/actions/setup-haxe/action.yml @@ -56,11 +56,10 @@ runs: shell: bash run: | echo "TIMER_HAXELIB=$(date +%s)" >> "$GITHUB_ENV" - haxelib --debug --never install haxelib 4.1.0 --global - haxelib --debug --never deleterepo || true + haxelib --debug --always git haxelib https://github.com/FunkinCrew/haxelib.git funkin-patches --skip-dependencies --global + rm -rf .haxelib haxelib --debug --never newrepo echo "HAXEPATH=$(haxelib config)" >> "$GITHUB_ENV" - haxelib --debug --always --global git haxelib https://github.com/FunkinCrew/haxelib.git funkin-patches --skip-dependencies haxelib --debug --global --always git hmm https://github.com/FunkinCrew/hmm funkin-patches echo "TIMER_DEPS=$(date +%s)" >> "$GITHUB_ENV" diff --git a/.github/workflows/build-game.yml b/.github/workflows/build-game.yml index ba8167607..46f478a14 100644 --- a/.github/workflows/build-game.yml +++ b/.github/workflows/build-game.yml @@ -112,6 +112,7 @@ jobs: run: | git config --global 'url.https://x-access-token:${{ steps.app_token.outputs.token }}@github.com/.insteadOf' https://github.com/ haxelib --global run hmm install -q + cd .haxelib/hxcpp/git/tools/hxcpp && haxe compile.hxml - if: ${{ matrix.target != 'html5' }} name: Restore hxcpp cache diff --git a/build/Dockerfile b/build/Dockerfile index c545d1364..0e61bd92c 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -137,8 +137,8 @@ ENV PATH="$HAXEPATH:$PATH" RUN < Date: Mon, 26 Aug 2024 18:12:16 +0200 Subject: [PATCH 02/10] pulseaudio --- .github/actions/setup-haxe/action.yml | 2 +- build/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/actions/setup-haxe/action.yml b/.github/actions/setup-haxe/action.yml index cf74cfb63..298dda631 100644 --- a/.github/actions/setup-haxe/action.yml +++ b/.github/actions/setup-haxe/action.yml @@ -44,7 +44,7 @@ runs: g++ \ libx11-dev libxi-dev libxext-dev libxinerama-dev libxrandr-dev \ libgl-dev libgl1-mesa-dev \ - libasound2-dev + libasound2-dev libpulse-dev ln -s /usr/lib/x86_64-linux-gnu/libffi.so.8 /usr/lib/x86_64-linux-gnu/libffi.so.6 || true - name: Install linux-specific dependencies if: ${{ runner.os == 'Linux' && contains(inputs.targets, 'linux') }} diff --git a/build/Dockerfile b/build/Dockerfile index 0e61bd92c..318870166 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -83,7 +83,7 @@ apt-fast install -y --no-install-recommends \ libc6-dev libffi-dev \ libx11-dev libxi-dev libxext-dev libxinerama-dev libxrandr-dev \ libgl-dev libgl1-mesa-dev \ - libasound2-dev \ + libasound2-dev libpulse-dev \ libvlc-dev libvlccore-dev EOF From 1089764ab62a174525aaa6159e15db04b91df20a Mon Sep 17 00:00:00 2001 From: mint Date: Mon, 26 Aug 2024 18:56:32 +0200 Subject: [PATCH 03/10] suppress useless git warnings --- .github/workflows/build-game.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build-game.yml b/.github/workflows/build-game.yml index 46f478a14..dff9a369d 100644 --- a/.github/workflows/build-game.yml +++ b/.github/workflows/build-game.yml @@ -111,6 +111,7 @@ jobs: name: Install dependencies run: | git config --global 'url.https://x-access-token:${{ steps.app_token.outputs.token }}@github.com/.insteadOf' https://github.com/ + git config --global advice.detachedHead false haxelib --global run hmm install -q cd .haxelib/hxcpp/git/tools/hxcpp && haxe compile.hxml From 7cac3c95eea321367803ebb77c8e8c4a9de098a8 Mon Sep 17 00:00:00 2001 From: mint Date: Mon, 26 Aug 2024 19:27:11 +0200 Subject: [PATCH 04/10] config the haxelib :eye: --- .github/actions/setup-haxe/action.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/actions/setup-haxe/action.yml b/.github/actions/setup-haxe/action.yml index 298dda631..918718c55 100644 --- a/.github/actions/setup-haxe/action.yml +++ b/.github/actions/setup-haxe/action.yml @@ -56,11 +56,14 @@ runs: shell: bash run: | echo "TIMER_HAXELIB=$(date +%s)" >> "$GITHUB_ENV" - haxelib --debug --always git haxelib https://github.com/FunkinCrew/haxelib.git funkin-patches --skip-dependencies --global + haxelib remove --global haxelib git + haxelib remove --global hmm git rm -rf .haxelib + git config -l --show-scope + haxelib --debug --never --global git haxelib https://github.com/FunkinCrew/haxelib.git funkin-patches --skip-dependencies + haxelib --debug --never --global git hmm https://github.com/FunkinCrew/hmm funkin-patches haxelib --debug --never newrepo echo "HAXEPATH=$(haxelib config)" >> "$GITHUB_ENV" - haxelib --debug --global --always git hmm https://github.com/FunkinCrew/hmm funkin-patches echo "TIMER_DEPS=$(date +%s)" >> "$GITHUB_ENV" - name: Restore cached dependencies From 0193bde70058e0017ac253ed053917b0752820bb Mon Sep 17 00:00:00 2001 From: mint Date: Mon, 26 Aug 2024 19:32:38 +0200 Subject: [PATCH 05/10] hm, pain --- .github/actions/setup-haxe/action.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/actions/setup-haxe/action.yml b/.github/actions/setup-haxe/action.yml index 918718c55..4a81d0079 100644 --- a/.github/actions/setup-haxe/action.yml +++ b/.github/actions/setup-haxe/action.yml @@ -56,13 +56,16 @@ runs: shell: bash run: | echo "TIMER_HAXELIB=$(date +%s)" >> "$GITHUB_ENV" - haxelib remove --global haxelib git - haxelib remove --global hmm git + haxelib --debug --never --global install haxelib 4.1.0 + haxelib --global set haxelib 4.1.0 + haxelib --global remove haxelib git + haxelib --global remove hmm git rm -rf .haxelib git config -l --show-scope haxelib --debug --never --global git haxelib https://github.com/FunkinCrew/haxelib.git funkin-patches --skip-dependencies haxelib --debug --never --global git hmm https://github.com/FunkinCrew/hmm funkin-patches haxelib --debug --never newrepo + haxelib version echo "HAXEPATH=$(haxelib config)" >> "$GITHUB_ENV" echo "TIMER_DEPS=$(date +%s)" >> "$GITHUB_ENV" From 8010441befab58f56e5ef12859555a4c41762d96 Mon Sep 17 00:00:00 2001 From: mint Date: Mon, 26 Aug 2024 19:34:30 +0200 Subject: [PATCH 06/10] haxelib --- .github/actions/setup-haxe/action.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/actions/setup-haxe/action.yml b/.github/actions/setup-haxe/action.yml index 4a81d0079..193c81d1f 100644 --- a/.github/actions/setup-haxe/action.yml +++ b/.github/actions/setup-haxe/action.yml @@ -56,10 +56,11 @@ runs: shell: bash run: | echo "TIMER_HAXELIB=$(date +%s)" >> "$GITHUB_ENV" + haxelib fixrepo --global haxelib --debug --never --global install haxelib 4.1.0 haxelib --global set haxelib 4.1.0 haxelib --global remove haxelib git - haxelib --global remove hmm git + haxelib --global remove hmm rm -rf .haxelib git config -l --show-scope haxelib --debug --never --global git haxelib https://github.com/FunkinCrew/haxelib.git funkin-patches --skip-dependencies From 514aa576eafdb5fc5444d1689be5765053e940cd Mon Sep 17 00:00:00 2001 From: mint Date: Mon, 26 Aug 2024 19:35:54 +0200 Subject: [PATCH 07/10] haxelib --- .github/actions/setup-haxe/action.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/actions/setup-haxe/action.yml b/.github/actions/setup-haxe/action.yml index 193c81d1f..aba5371b5 100644 --- a/.github/actions/setup-haxe/action.yml +++ b/.github/actions/setup-haxe/action.yml @@ -56,11 +56,10 @@ runs: shell: bash run: | echo "TIMER_HAXELIB=$(date +%s)" >> "$GITHUB_ENV" - haxelib fixrepo --global + haxelib fixrepo --global || true haxelib --debug --never --global install haxelib 4.1.0 - haxelib --global set haxelib 4.1.0 - haxelib --global remove haxelib git - haxelib --global remove hmm + haxelib --global remove haxelib git || true + haxelib --global remove hmm || true rm -rf .haxelib git config -l --show-scope haxelib --debug --never --global git haxelib https://github.com/FunkinCrew/haxelib.git funkin-patches --skip-dependencies From 266bf939a977c8136bce647a4475cdc6ebe1f69e Mon Sep 17 00:00:00 2001 From: mint Date: Mon, 26 Aug 2024 19:38:21 +0200 Subject: [PATCH 08/10] haxelib --- .github/actions/setup-haxe/action.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/actions/setup-haxe/action.yml b/.github/actions/setup-haxe/action.yml index aba5371b5..97bc02e66 100644 --- a/.github/actions/setup-haxe/action.yml +++ b/.github/actions/setup-haxe/action.yml @@ -58,6 +58,7 @@ runs: echo "TIMER_HAXELIB=$(date +%s)" >> "$GITHUB_ENV" haxelib fixrepo --global || true haxelib --debug --never --global install haxelib 4.1.0 + haxelib --debug --global set haxelib 4.1.0 haxelib --global remove haxelib git || true haxelib --global remove hmm || true rm -rf .haxelib From a778555a973bc3227689b592aec084f349579640 Mon Sep 17 00:00:00 2001 From: mint Date: Mon, 26 Aug 2024 19:52:53 +0200 Subject: [PATCH 09/10] more debug info --- .github/actions/setup-haxe/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/setup-haxe/action.yml b/.github/actions/setup-haxe/action.yml index 97bc02e66..9da7d3272 100644 --- a/.github/actions/setup-haxe/action.yml +++ b/.github/actions/setup-haxe/action.yml @@ -62,7 +62,7 @@ runs: haxelib --global remove haxelib git || true haxelib --global remove hmm || true rm -rf .haxelib - git config -l --show-scope + git config -l --show-scope --show-origin haxelib --debug --never --global git haxelib https://github.com/FunkinCrew/haxelib.git funkin-patches --skip-dependencies haxelib --debug --never --global git hmm https://github.com/FunkinCrew/hmm funkin-patches haxelib --debug --never newrepo From 3c208ee143c271f4fd1cf8293aa96680e04e135c Mon Sep 17 00:00:00 2001 From: mint Date: Mon, 26 Aug 2024 20:00:53 +0200 Subject: [PATCH 10/10] git cleanup crew --- .github/actions/setup-haxe/action.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/actions/setup-haxe/action.yml b/.github/actions/setup-haxe/action.yml index 9da7d3272..438f330a2 100644 --- a/.github/actions/setup-haxe/action.yml +++ b/.github/actions/setup-haxe/action.yml @@ -62,7 +62,6 @@ runs: haxelib --global remove haxelib git || true haxelib --global remove hmm || true rm -rf .haxelib - git config -l --show-scope --show-origin haxelib --debug --never --global git haxelib https://github.com/FunkinCrew/haxelib.git funkin-patches --skip-dependencies haxelib --debug --never --global git hmm https://github.com/FunkinCrew/hmm funkin-patches haxelib --debug --never newrepo @@ -81,7 +80,11 @@ runs: name: Prep git for dependency install uses: gacts/run-and-post-run@v1 with: - run: git config --global 'url.https://x-access-token:${{ inputs.gh-token }}@github.com/.insteadOf' https://github.com/ + run: | + git config --global --name-only --get-regexp 'url\.https\:\/\/x-access-token:.+@github\.com\/\.insteadOf' \ + | xargs git config --global --unset + git config -l --show-scope --show-origin + git config --global 'url.https://x-access-token:${{ inputs.gh-token }}@github.com/.insteadOf' https://github.com/ post: git config --global --unset 'url.https://x-access-token:${{ inputs.gh-token }}@github.com/.insteadOf' - if: ${{ steps.cache-hmm.outputs.cache-hit != 'true' }}