From e1e903bb1ee3964c616a8a182bcb247aa2b96d82 Mon Sep 17 00:00:00 2001 From: Diavolo Date: Sat, 2 Mar 2024 11:22:14 +0100 Subject: [PATCH 01/16] build: test OAT --- .gitea/workflows/link-linux.yml | 29 +++++++++++++++++++++++++++++ .gitmodules | 3 +++ iw5-zones | 1 + 3 files changed, 33 insertions(+) create mode 100644 .gitea/workflows/link-linux.yml create mode 100644 .gitmodules create mode 160000 iw5-zones diff --git a/.gitea/workflows/link-linux.yml b/.gitea/workflows/link-linux.yml new file mode 100644 index 0000000..869f2e0 --- /dev/null +++ b/.gitea/workflows/link-linux.yml @@ -0,0 +1,29 @@ +name: link + +on: [push] + +jobs: + link-linux: + name: Link on Linux + runs-on: ubuntu-latest + + steps: + - name: Check out files + uses: actions/checkout@main + with: + submodules: true + fetch-depth: 0 + lfs: true + + - name: Setup OAT + uses: diamante0018/setup-oat@main + with: + version: "0.9.0" + + - name: Create code_post_gfx_mp + run: | + Linker -v -l "./iw5-zones/zone/english/code_post_gfx_mp.ff" code_post_gfx_mp + + - name: Create localized_ui_mp + run: | + Linker -v -l "./iw5-zones/zone/english/localized_ui_mp.ff" localized_ui_mp diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..d935e27 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "iw5-zones"] + path = iw5-zones + url = https://git.alterware.dev/AlterWare/iw5-zones.git diff --git a/iw5-zones b/iw5-zones new file mode 160000 index 0000000..a82a49d --- /dev/null +++ b/iw5-zones @@ -0,0 +1 @@ +Subproject commit a82a49d1c1e2af533bec5f306fdbd375a671d073 -- 2.34.1 From de80e73c2dd640395a34bea13ddf4e5e80e21ae7 Mon Sep 17 00:00:00 2001 From: Diavolo Date: Sat, 2 Mar 2024 11:24:17 +0100 Subject: [PATCH 02/16] build: install LFS --- .gitea/workflows/link-linux.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.gitea/workflows/link-linux.yml b/.gitea/workflows/link-linux.yml index 869f2e0..eed1e3a 100644 --- a/.gitea/workflows/link-linux.yml +++ b/.gitea/workflows/link-linux.yml @@ -8,6 +8,11 @@ jobs: runs-on: ubuntu-latest steps: + - name: Install Git LFS + run: | + apt-get update + apt-get install git-lfs -y + - name: Check out files uses: actions/checkout@main with: -- 2.34.1 From 66a0fb5065d8c1770c4ab9b26161325163381583 Mon Sep 17 00:00:00 2001 From: Diavolo Date: Sat, 2 Mar 2024 11:31:21 +0100 Subject: [PATCH 03/16] build: use deploy keys --- .gitea/workflows/link-linux.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitea/workflows/link-linux.yml b/.gitea/workflows/link-linux.yml index eed1e3a..04454e8 100644 --- a/.gitea/workflows/link-linux.yml +++ b/.gitea/workflows/link-linux.yml @@ -19,6 +19,7 @@ jobs: submodules: true fetch-depth: 0 lfs: true + ssh-key: ${{ secrets.IW5_ZONES_PRIVATE_KEY }} - name: Setup OAT uses: diamante0018/setup-oat@main -- 2.34.1 From c5abc99d55d84756539b909ff851af941bb16005 Mon Sep 17 00:00:00 2001 From: Diavolo Date: Sat, 2 Mar 2024 11:36:06 +0100 Subject: [PATCH 04/16] build: try to specify repo as well --- .gitea/workflows/link-linux.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitea/workflows/link-linux.yml b/.gitea/workflows/link-linux.yml index 04454e8..7f04a99 100644 --- a/.gitea/workflows/link-linux.yml +++ b/.gitea/workflows/link-linux.yml @@ -16,6 +16,7 @@ jobs: - name: Check out files uses: actions/checkout@main with: + repository: AlterWare/iw5-zones submodules: true fetch-depth: 0 lfs: true -- 2.34.1 From 4a2af49b567e08cc4c9d087008a58b77b8092abf Mon Sep 17 00:00:00 2001 From: Diavolo Date: Sat, 2 Mar 2024 11:40:39 +0100 Subject: [PATCH 05/16] build: make cache repo public --- .gitea/workflows/link-linux.yml | 6 ++---- .gitmodules | 4 ++-- iw5-zones => deps/iw5-zones | 0 3 files changed, 4 insertions(+), 6 deletions(-) rename iw5-zones => deps/iw5-zones (100%) diff --git a/.gitea/workflows/link-linux.yml b/.gitea/workflows/link-linux.yml index 7f04a99..0f3b3fb 100644 --- a/.gitea/workflows/link-linux.yml +++ b/.gitea/workflows/link-linux.yml @@ -16,11 +16,9 @@ jobs: - name: Check out files uses: actions/checkout@main with: - repository: AlterWare/iw5-zones submodules: true fetch-depth: 0 lfs: true - ssh-key: ${{ secrets.IW5_ZONES_PRIVATE_KEY }} - name: Setup OAT uses: diamante0018/setup-oat@main @@ -29,8 +27,8 @@ jobs: - name: Create code_post_gfx_mp run: | - Linker -v -l "./iw5-zones/zone/english/code_post_gfx_mp.ff" code_post_gfx_mp + Linker -v -l "./deps/iw5-zones/zone/english/code_post_gfx_mp.ff" code_post_gfx_mp - name: Create localized_ui_mp run: | - Linker -v -l "./iw5-zones/zone/english/localized_ui_mp.ff" localized_ui_mp + Linker -v -l "./deps/iw5-zones/zone/english/localized_ui_mp.ff" localized_ui_mp diff --git a/.gitmodules b/.gitmodules index d935e27..d144a93 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ -[submodule "iw5-zones"] - path = iw5-zones +[submodule "deps/iw5-zones"] + path = deps/iw5-zones url = https://git.alterware.dev/AlterWare/iw5-zones.git diff --git a/iw5-zones b/deps/iw5-zones similarity index 100% rename from iw5-zones rename to deps/iw5-zones -- 2.34.1 From 3e81629246070366e7009919059277e277e9dfea Mon Sep 17 00:00:00 2001 From: Diavolo Date: Sat, 2 Mar 2024 11:43:48 +0100 Subject: [PATCH 06/16] build: deploy keys again --- .gitea/workflows/link-linux.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitea/workflows/link-linux.yml b/.gitea/workflows/link-linux.yml index 0f3b3fb..08c4499 100644 --- a/.gitea/workflows/link-linux.yml +++ b/.gitea/workflows/link-linux.yml @@ -19,6 +19,7 @@ jobs: submodules: true fetch-depth: 0 lfs: true + ssh-key: ${{ secrets.IW5_ZONES_PRIVATE_KEY }} - name: Setup OAT uses: diamante0018/setup-oat@main -- 2.34.1 From f15a65ee4f275fa4c8e74e93f0acf60c88d3d6f2 Mon Sep 17 00:00:00 2001 From: Diavolo Date: Sat, 2 Mar 2024 11:46:38 +0100 Subject: [PATCH 07/16] build: remove LFS --- .gitea/workflows/link-linux.yml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/.gitea/workflows/link-linux.yml b/.gitea/workflows/link-linux.yml index 08c4499..2b00e5a 100644 --- a/.gitea/workflows/link-linux.yml +++ b/.gitea/workflows/link-linux.yml @@ -8,18 +8,11 @@ jobs: runs-on: ubuntu-latest steps: - - name: Install Git LFS - run: | - apt-get update - apt-get install git-lfs -y - - name: Check out files uses: actions/checkout@main with: submodules: true fetch-depth: 0 - lfs: true - ssh-key: ${{ secrets.IW5_ZONES_PRIVATE_KEY }} - name: Setup OAT uses: diamante0018/setup-oat@main -- 2.34.1 From c1291b6ba223aef8029b9f604ed8046fea792e87 Mon Sep 17 00:00:00 2001 From: Diavolo Date: Sat, 2 Mar 2024 11:48:04 +0100 Subject: [PATCH 08/16] deps: force this --- deps/iw5-zones | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps/iw5-zones b/deps/iw5-zones index a82a49d..bd78584 160000 --- a/deps/iw5-zones +++ b/deps/iw5-zones @@ -1 +1 @@ -Subproject commit a82a49d1c1e2af533bec5f306fdbd375a671d073 +Subproject commit bd78584a7e72ac992ca6ba6aaabc933c44235909 -- 2.34.1 From 438662b4376668c9f7dd086c032196337b4a6e12 Mon Sep 17 00:00:00 2001 From: Diavolo Date: Sat, 2 Mar 2024 11:55:50 +0100 Subject: [PATCH 09/16] build: use 0.8.3 --- .gitea/workflows/link-linux.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/link-linux.yml b/.gitea/workflows/link-linux.yml index 2b00e5a..6a00bc6 100644 --- a/.gitea/workflows/link-linux.yml +++ b/.gitea/workflows/link-linux.yml @@ -17,7 +17,7 @@ jobs: - name: Setup OAT uses: diamante0018/setup-oat@main with: - version: "0.9.0" + version: "0.8.3" - name: Create code_post_gfx_mp run: | -- 2.34.1 From a3fc223c6401446d1d41f143115cc3492c64392c Mon Sep 17 00:00:00 2001 From: Diavolo Date: Sat, 2 Mar 2024 11:58:23 +0100 Subject: [PATCH 10/16] build: ls --- .gitea/workflows/link-linux.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/link-linux.yml b/.gitea/workflows/link-linux.yml index 6a00bc6..51c8488 100644 --- a/.gitea/workflows/link-linux.yml +++ b/.gitea/workflows/link-linux.yml @@ -19,10 +19,14 @@ jobs: with: version: "0.8.3" + - name: Help me figure this out + run: | + ls -a + - name: Create code_post_gfx_mp run: | - Linker -v -l "./deps/iw5-zones/zone/english/code_post_gfx_mp.ff" code_post_gfx_mp + ./Linker -v -l "./deps/iw5-zones/zone/english/code_post_gfx_mp.ff" code_post_gfx_mp - name: Create localized_ui_mp run: | - Linker -v -l "./deps/iw5-zones/zone/english/localized_ui_mp.ff" localized_ui_mp + ./Linker -v -l "./deps/iw5-zones/zone/english/localized_ui_mp.ff" localized_ui_mp -- 2.34.1 From 19f79457e84f031e1b00edb1b22799ee68245a1f Mon Sep 17 00:00:00 2001 From: Diavolo Date: Sat, 2 Mar 2024 11:59:26 +0100 Subject: [PATCH 11/16] build: kek 2 --- .gitea/workflows/link-linux.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitea/workflows/link-linux.yml b/.gitea/workflows/link-linux.yml index 51c8488..44647c5 100644 --- a/.gitea/workflows/link-linux.yml +++ b/.gitea/workflows/link-linux.yml @@ -22,6 +22,8 @@ jobs: - name: Help me figure this out run: | ls -a + cd .OAT + ls -a - name: Create code_post_gfx_mp run: | -- 2.34.1 From fc5895f2603def47c77294e2227aeff07cb8c7d7 Mon Sep 17 00:00:00 2001 From: Diavolo Date: Sat, 2 Mar 2024 12:00:22 +0100 Subject: [PATCH 12/16] build: hard code path? --- .gitea/workflows/link-linux.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/link-linux.yml b/.gitea/workflows/link-linux.yml index 44647c5..fee3545 100644 --- a/.gitea/workflows/link-linux.yml +++ b/.gitea/workflows/link-linux.yml @@ -27,8 +27,8 @@ jobs: - name: Create code_post_gfx_mp run: | - ./Linker -v -l "./deps/iw5-zones/zone/english/code_post_gfx_mp.ff" code_post_gfx_mp + ./.OAT/Linker -v -l "./deps/iw5-zones/zone/english/code_post_gfx_mp.ff" code_post_gfx_mp - name: Create localized_ui_mp run: | - ./Linker -v -l "./deps/iw5-zones/zone/english/localized_ui_mp.ff" localized_ui_mp + ./.OAT/Linker -v -l "./deps/iw5-zones/zone/english/localized_ui_mp.ff" localized_ui_mp -- 2.34.1 From 6abcae10232d8f3b349ca760c79e10707d6ddf6d Mon Sep 17 00:00:00 2001 From: Diavolo Date: Sat, 2 Mar 2024 12:09:05 +0100 Subject: [PATCH 13/16] build: hard code path? --- .gitea/workflows/link-linux.yml | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/.gitea/workflows/link-linux.yml b/.gitea/workflows/link-linux.yml index fee3545..6a00bc6 100644 --- a/.gitea/workflows/link-linux.yml +++ b/.gitea/workflows/link-linux.yml @@ -19,16 +19,10 @@ jobs: with: version: "0.8.3" - - name: Help me figure this out - run: | - ls -a - cd .OAT - ls -a - - name: Create code_post_gfx_mp run: | - ./.OAT/Linker -v -l "./deps/iw5-zones/zone/english/code_post_gfx_mp.ff" code_post_gfx_mp + Linker -v -l "./deps/iw5-zones/zone/english/code_post_gfx_mp.ff" code_post_gfx_mp - name: Create localized_ui_mp run: | - ./.OAT/Linker -v -l "./deps/iw5-zones/zone/english/localized_ui_mp.ff" localized_ui_mp + Linker -v -l "./deps/iw5-zones/zone/english/localized_ui_mp.ff" localized_ui_mp -- 2.34.1 From dd84130b00f01bc588812cee32cc8c11c717c1b9 Mon Sep 17 00:00:00 2001 From: Diavolo Date: Sat, 2 Mar 2024 12:20:53 +0100 Subject: [PATCH 14/16] build: imagine asking chat gpt for help --- .gitea/workflows/link-linux.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.gitea/workflows/link-linux.yml b/.gitea/workflows/link-linux.yml index 6a00bc6..7e2aed7 100644 --- a/.gitea/workflows/link-linux.yml +++ b/.gitea/workflows/link-linux.yml @@ -19,6 +19,14 @@ jobs: with: version: "0.8.3" + - name: Add executable permissions + run: | + chmod +x ./.OAT/Linker + + - name: Debug + run: + ls -a ./.OAT + - name: Create code_post_gfx_mp run: | Linker -v -l "./deps/iw5-zones/zone/english/code_post_gfx_mp.ff" code_post_gfx_mp -- 2.34.1 From 394748b335210da0e667617feb719e8ce9bfe1c1 Mon Sep 17 00:00:00 2001 From: Diavolo Date: Sat, 2 Mar 2024 12:23:01 +0100 Subject: [PATCH 15/16] build: absolute path --- .gitea/workflows/link-linux.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/link-linux.yml b/.gitea/workflows/link-linux.yml index 7e2aed7..3c2a513 100644 --- a/.gitea/workflows/link-linux.yml +++ b/.gitea/workflows/link-linux.yml @@ -29,8 +29,8 @@ jobs: - name: Create code_post_gfx_mp run: | - Linker -v -l "./deps/iw5-zones/zone/english/code_post_gfx_mp.ff" code_post_gfx_mp + ./.OAT/Linker -v -l "./deps/iw5-zones/zone/english/code_post_gfx_mp.ff" code_post_gfx_mp - name: Create localized_ui_mp run: | - Linker -v -l "./deps/iw5-zones/zone/english/localized_ui_mp.ff" localized_ui_mp + ./.OAT/Linker -v -l "./deps/iw5-zones/zone/english/localized_ui_mp.ff" localized_ui_mp -- 2.34.1 From 098132ca97f6392e3d21fa3dbfb6f90248ce3a11 Mon Sep 17 00:00:00 2001 From: Jack Back Date: Sun, 3 Mar 2024 09:19:36 +0000 Subject: [PATCH 16/16] Update .gitea/workflows/link-linux.yml --- .gitea/workflows/link-linux.yml | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/.gitea/workflows/link-linux.yml b/.gitea/workflows/link-linux.yml index 3c2a513..dc62ac2 100644 --- a/.gitea/workflows/link-linux.yml +++ b/.gitea/workflows/link-linux.yml @@ -19,18 +19,15 @@ jobs: with: version: "0.8.3" - - name: Add executable permissions + - name: Install deps run: | - chmod +x ./.OAT/Linker - - - name: Debug - run: - ls -a ./.OAT + apt update + apt install gcc g++ gcc-multilib g++-multilib -y - name: Create code_post_gfx_mp run: | - ./.OAT/Linker -v -l "./deps/iw5-zones/zone/english/code_post_gfx_mp.ff" code_post_gfx_mp + Linker -v -l "./deps/iw5-zones/zone/english/code_post_gfx_mp.ff" code_post_gfx_mp - name: Create localized_ui_mp run: | - ./.OAT/Linker -v -l "./deps/iw5-zones/zone/english/localized_ui_mp.ff" localized_ui_mp + Linker -v -l "./deps/iw5-zones/zone/english/localized_ui_mp.ff" localized_ui_mp -- 2.34.1