From 50b3049c93051a356d18a5413022fbd1f8933546 Mon Sep 17 00:00:00 2001 From: Jack Back Date: Mon, 25 Mar 2024 22:43:13 +0100 Subject: [PATCH 01/57] build: test out cursed CI --- .gitea/workflows/link.yml | 31 +++++++++++++++++++++++++++++++ .gitmodules | 3 +++ deps/iw5-zones | 1 + 3 files changed, 35 insertions(+) create mode 100644 .gitea/workflows/link.yml create mode 100644 .gitmodules create mode 160000 deps/iw5-zones diff --git a/.gitea/workflows/link.yml b/.gitea/workflows/link.yml new file mode 100644 index 0000000..470b561 --- /dev/null +++ b/.gitea/workflows/link.yml @@ -0,0 +1,31 @@ +name: link + +on: [push] + +jobs: + link-linux: + name: Link assets on Linux + runs-on: ubuntu-latest + + steps: + - name: Check out files + uses: actions/checkout@v4 + with: + submodules: true + fetch-depth: 0 + # NOTE - If LFS ever starts getting used for storing zones, switch this to true! + lfs: false + + - name: Install Docker + run: | + curl -fsSL https://get.docker.com -o get-docker.sh + sh get-docker.sh + + - name: Setup OAT + uses: diamante0018/setup-oat@main + with: + version: "0.10.0" + + - name: Link assets + run: | + docker run --rm -v $PWD:/workdir ubuntu:noble Linker -v --load "deps/iw5-zones/zone/english/code_post_gfx_mp.ff" --menu-permissive --menu-no-optimization code_post_gfx_mp diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..d144a93 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "deps/iw5-zones"] + path = deps/iw5-zones + url = https://git.alterware.dev/AlterWare/iw5-zones.git diff --git a/deps/iw5-zones b/deps/iw5-zones new file mode 160000 index 0000000..bd78584 --- /dev/null +++ b/deps/iw5-zones @@ -0,0 +1 @@ +Subproject commit bd78584a7e72ac992ca6ba6aaabc933c44235909 -- 2.34.1 From 87cdfc6f609446ec3339134901062caf04ee3cab Mon Sep 17 00:00:00 2001 From: Jack Back Date: Mon, 25 Mar 2024 22:47:48 +0100 Subject: [PATCH 02/57] build: I let the AI do this one --- .gitea/workflows/link.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/link.yml b/.gitea/workflows/link.yml index 470b561..67b5d54 100644 --- a/.gitea/workflows/link.yml +++ b/.gitea/workflows/link.yml @@ -28,4 +28,4 @@ jobs: - name: Link assets run: | - docker run --rm -v $PWD:/workdir ubuntu:noble Linker -v --load "deps/iw5-zones/zone/english/code_post_gfx_mp.ff" --menu-permissive --menu-no-optimization code_post_gfx_mp + docker run --rm -v $PWD:/workdir ubuntu:noble /bin/bash -c "cd /workdir && cd .oat && ./Linker -v --load \"deps/iw5-zones/zone/english/code_post_gfx_mp.ff\" --menu-permissive --menu-no-optimization code_post_gfx_mp" -- 2.34.1 From 270d69b6f36d0dd4ab68bea922a5fefd0aec86b2 Mon Sep 17 00:00:00 2001 From: Jack Back Date: Mon, 25 Mar 2024 22:49:16 +0100 Subject: [PATCH 03/57] build: I test AI shit now --- .gitea/workflows/link.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/link.yml b/.gitea/workflows/link.yml index 67b5d54..92886ea 100644 --- a/.gitea/workflows/link.yml +++ b/.gitea/workflows/link.yml @@ -28,4 +28,4 @@ jobs: - name: Link assets run: | - docker run --rm -v $PWD:/workdir ubuntu:noble /bin/bash -c "cd /workdir && cd .oat && ./Linker -v --load \"deps/iw5-zones/zone/english/code_post_gfx_mp.ff\" --menu-permissive --menu-no-optimization code_post_gfx_mp" + docker run --rm -v $PWD:/workdir ubuntu:noble /bin/bash -c "ls && cd .oat && ./Linker -v --load \"deps/iw5-zones/zone/english/code_post_gfx_mp.ff\" --menu-permissive --menu-no-optimization code_post_gfx_mp" -- 2.34.1 From 415bec7067c9ad07d4c0f0929ec46ba92d4fe5b5 Mon Sep 17 00:00:00 2001 From: Jack Back Date: Mon, 25 Mar 2024 22:52:33 +0100 Subject: [PATCH 04/57] build: I test AI shit now (2) --- .gitea/workflows/link.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/link.yml b/.gitea/workflows/link.yml index 92886ea..8e6c258 100644 --- a/.gitea/workflows/link.yml +++ b/.gitea/workflows/link.yml @@ -28,4 +28,4 @@ jobs: - name: Link assets run: | - docker run --rm -v $PWD:/workdir ubuntu:noble /bin/bash -c "ls && cd .oat && ./Linker -v --load \"deps/iw5-zones/zone/english/code_post_gfx_mp.ff\" --menu-permissive --menu-no-optimization code_post_gfx_mp" + docker run --rm -v $PWD:/workdir ubuntu:noble /bin/bash -c "cd workdir && ls && cd .oat && ls -- 2.34.1 From c286a77df3a151e5ade317f1f96335f6f8c377c9 Mon Sep 17 00:00:00 2001 From: Jack Back Date: Mon, 25 Mar 2024 22:53:30 +0100 Subject: [PATCH 05/57] build: I test AI shit now (my mistake) --- .gitea/workflows/link.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/link.yml b/.gitea/workflows/link.yml index 8e6c258..1d7b60c 100644 --- a/.gitea/workflows/link.yml +++ b/.gitea/workflows/link.yml @@ -28,4 +28,4 @@ jobs: - name: Link assets run: | - docker run --rm -v $PWD:/workdir ubuntu:noble /bin/bash -c "cd workdir && ls && cd .oat && ls + docker run --rm -v $PWD:/workdir ubuntu:noble /bin/bash -c "cd workdir && ls && cd .oat && ls" -- 2.34.1 From 3fc16142247c2a8c8dcf56c463116af334642064 Mon Sep 17 00:00:00 2001 From: Jack Back Date: Mon, 25 Mar 2024 22:57:01 +0100 Subject: [PATCH 06/57] build: I try AI stuff again + copy pasted from myself --- .gitea/workflows/link.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/link.yml b/.gitea/workflows/link.yml index 1d7b60c..fde1ae1 100644 --- a/.gitea/workflows/link.yml +++ b/.gitea/workflows/link.yml @@ -28,4 +28,4 @@ jobs: - name: Link assets run: | - docker run --rm -v $PWD:/workdir ubuntu:noble /bin/bash -c "cd workdir && ls && cd .oat && ls" + docker run --rm -v $PWD:/workdir -workdir /workdir ubuntu:noble ./.oat/Linker -v --load "deps/iw5-zones/zone/english/code_post_gfx_mp.ff" --menu-permissive --menu-no-optimization code_post_gfx_mp -- 2.34.1 From 33d5efd6ee8290664f660ccf6a5583e544081b2e Mon Sep 17 00:00:00 2001 From: Jack Back Date: Mon, 25 Mar 2024 22:57:30 +0100 Subject: [PATCH 07/57] build: I cant copy paste from myself it seems --- .gitea/workflows/link.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/link.yml b/.gitea/workflows/link.yml index fde1ae1..8e4c211 100644 --- a/.gitea/workflows/link.yml +++ b/.gitea/workflows/link.yml @@ -28,4 +28,4 @@ jobs: - name: Link assets run: | - docker run --rm -v $PWD:/workdir -workdir /workdir ubuntu:noble ./.oat/Linker -v --load "deps/iw5-zones/zone/english/code_post_gfx_mp.ff" --menu-permissive --menu-no-optimization code_post_gfx_mp + docker run --rm -v $PWD:/workdir --workdir /workdir ubuntu:noble ./.oat/Linker -v --load "deps/iw5-zones/zone/english/code_post_gfx_mp.ff" --menu-permissive --menu-no-optimization code_post_gfx_mp -- 2.34.1 From f38a566009ebe548ccaefbddf1d60a2f303eaa2c Mon Sep 17 00:00:00 2001 From: Jack Back Date: Mon, 25 Mar 2024 22:59:49 +0100 Subject: [PATCH 08/57] build: test test --- .gitea/workflows/link.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/link.yml b/.gitea/workflows/link.yml index 8e4c211..37e91bc 100644 --- a/.gitea/workflows/link.yml +++ b/.gitea/workflows/link.yml @@ -28,4 +28,4 @@ jobs: - name: Link assets run: | - docker run --rm -v $PWD:/workdir --workdir /workdir ubuntu:noble ./.oat/Linker -v --load "deps/iw5-zones/zone/english/code_post_gfx_mp.ff" --menu-permissive --menu-no-optimization code_post_gfx_mp + docker run --rm -v $PWD:/workdir --workdir /workdir ubuntu:noble /bin/bash -c "ls" -- 2.34.1 From 68b1297f4677aa7edd066a0cb73b7183e1c550f6 Mon Sep 17 00:00:00 2001 From: Jack Back Date: Mon, 25 Mar 2024 23:02:54 +0100 Subject: [PATCH 09/57] build: go back to this method? --- .gitea/workflows/link.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.gitea/workflows/link.yml b/.gitea/workflows/link.yml index 37e91bc..300fece 100644 --- a/.gitea/workflows/link.yml +++ b/.gitea/workflows/link.yml @@ -16,16 +16,16 @@ jobs: # NOTE - If LFS ever starts getting used for storing zones, switch this to true! lfs: false - - name: Install Docker - run: | - curl -fsSL https://get.docker.com -o get-docker.sh - sh get-docker.sh - - name: Setup OAT uses: diamante0018/setup-oat@main with: version: "0.10.0" - name: Link assets - run: | - docker run --rm -v $PWD:/workdir --workdir /workdir ubuntu:noble /bin/bash -c "ls" + uses: addnab/docker-run-action@v3 + with: + image: ubuntu:noble + options: --volumes-from=${{ env.JOB_CONTAINER_NAME }} + run: | + cd ${{ github.workspace }} + ./.oat/Linker -v --load "deps/iw5-zones/zone/english/code_post_gfx_mp.ff" --menu-permissive --menu-no-optimization code_post_gfx_mp -- 2.34.1 From 12a945915c013aa3214b096953781252f915f2c1 Mon Sep 17 00:00:00 2001 From: Jack Back Date: Mon, 25 Mar 2024 23:03:49 +0100 Subject: [PATCH 10/57] build: bruh --- .gitea/workflows/link.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitea/workflows/link.yml b/.gitea/workflows/link.yml index 300fece..b70ecd2 100644 --- a/.gitea/workflows/link.yml +++ b/.gitea/workflows/link.yml @@ -28,4 +28,5 @@ jobs: options: --volumes-from=${{ env.JOB_CONTAINER_NAME }} run: | cd ${{ github.workspace }} + ls -la ./.oat/Linker -v --load "deps/iw5-zones/zone/english/code_post_gfx_mp.ff" --menu-permissive --menu-no-optimization code_post_gfx_mp -- 2.34.1 From bbdfc07340ba29c6692a2c8bf0669d1bcf280c24 Mon Sep 17 00:00:00 2001 From: Jack Back Date: Mon, 25 Mar 2024 23:04:45 +0100 Subject: [PATCH 11/57] build: bruh --- .gitea/workflows/link.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.gitea/workflows/link.yml b/.gitea/workflows/link.yml index b70ecd2..72fd1fd 100644 --- a/.gitea/workflows/link.yml +++ b/.gitea/workflows/link.yml @@ -28,5 +28,4 @@ jobs: options: --volumes-from=${{ env.JOB_CONTAINER_NAME }} run: | cd ${{ github.workspace }} - ls -la - ./.oat/Linker -v --load "deps/iw5-zones/zone/english/code_post_gfx_mp.ff" --menu-permissive --menu-no-optimization code_post_gfx_mp + ./.OAT/Linker -v --load "deps/iw5-zones/zone/english/code_post_gfx_mp.ff" --menu-permissive --menu-no-optimization code_post_gfx_mp -- 2.34.1 From 3ec6bc896188c1e9e7deea62d91ab76eb6868aa0 Mon Sep 17 00:00:00 2001 From: Jack Back Date: Mon, 25 Mar 2024 23:05:42 +0100 Subject: [PATCH 12/57] build: bruh --- .gitea/workflows/link.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitea/workflows/link.yml b/.gitea/workflows/link.yml index 72fd1fd..838935c 100644 --- a/.gitea/workflows/link.yml +++ b/.gitea/workflows/link.yml @@ -28,4 +28,7 @@ jobs: options: --volumes-from=${{ env.JOB_CONTAINER_NAME }} run: | cd ${{ github.workspace }} + ls -la + cd .OAT + ls -la ./.OAT/Linker -v --load "deps/iw5-zones/zone/english/code_post_gfx_mp.ff" --menu-permissive --menu-no-optimization code_post_gfx_mp -- 2.34.1 From 04de54ce836561070df8bbd9f6be6273b51d330f Mon Sep 17 00:00:00 2001 From: Jack Back Date: Mon, 25 Mar 2024 23:06:32 +0100 Subject: [PATCH 13/57] build: maybe now? --- .gitea/workflows/link.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.gitea/workflows/link.yml b/.gitea/workflows/link.yml index 838935c..72fd1fd 100644 --- a/.gitea/workflows/link.yml +++ b/.gitea/workflows/link.yml @@ -28,7 +28,4 @@ jobs: options: --volumes-from=${{ env.JOB_CONTAINER_NAME }} run: | cd ${{ github.workspace }} - ls -la - cd .OAT - ls -la ./.OAT/Linker -v --load "deps/iw5-zones/zone/english/code_post_gfx_mp.ff" --menu-permissive --menu-no-optimization code_post_gfx_mp -- 2.34.1 From 5888cb589bc4338fa1e3f7488c16c2d2213cff07 Mon Sep 17 00:00:00 2001 From: Jack Back Date: Mon, 25 Mar 2024 23:07:06 +0100 Subject: [PATCH 14/57] build: maybe now? --- .gitea/workflows/link.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/link.yml b/.gitea/workflows/link.yml index 72fd1fd..101f1dd 100644 --- a/.gitea/workflows/link.yml +++ b/.gitea/workflows/link.yml @@ -28,4 +28,4 @@ jobs: options: --volumes-from=${{ env.JOB_CONTAINER_NAME }} run: | cd ${{ github.workspace }} - ./.OAT/Linker -v --load "deps/iw5-zones/zone/english/code_post_gfx_mp.ff" --menu-permissive --menu-no-optimization code_post_gfx_mp + .OAT/Linker -v --load "deps/iw5-zones/zone/english/code_post_gfx_mp.ff" --menu-permissive --menu-no-optimization code_post_gfx_mp -- 2.34.1 From 156c7dbd5d5409c4abf31cc29b7316e86db9d89b Mon Sep 17 00:00:00 2001 From: Jack Back Date: Mon, 25 Mar 2024 23:07:47 +0100 Subject: [PATCH 15/57] build: maybe now? --- .gitea/workflows/link.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitea/workflows/link.yml b/.gitea/workflows/link.yml index 101f1dd..031c928 100644 --- a/.gitea/workflows/link.yml +++ b/.gitea/workflows/link.yml @@ -28,4 +28,5 @@ jobs: options: --volumes-from=${{ env.JOB_CONTAINER_NAME }} run: | cd ${{ github.workspace }} - .OAT/Linker -v --load "deps/iw5-zones/zone/english/code_post_gfx_mp.ff" --menu-permissive --menu-no-optimization code_post_gfx_mp + chmod +x .OAT/Linker + ./.OAT/Linker -v --load "deps/iw5-zones/zone/english/code_post_gfx_mp.ff" --menu-permissive --menu-no-optimization code_post_gfx_mp -- 2.34.1 From 01838dbc9ca8f4ea6539a039462317ea5a8fd518 Mon Sep 17 00:00:00 2001 From: Jack Back Date: Mon, 25 Mar 2024 23:08:41 +0100 Subject: [PATCH 16/57] build: maybe now? --- .gitea/workflows/link.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.gitea/workflows/link.yml b/.gitea/workflows/link.yml index 031c928..6f46261 100644 --- a/.gitea/workflows/link.yml +++ b/.gitea/workflows/link.yml @@ -28,5 +28,8 @@ jobs: options: --volumes-from=${{ env.JOB_CONTAINER_NAME }} run: | cd ${{ github.workspace }} - chmod +x .OAT/Linker + cd .OAT + ls + chmod +x Linker + cd .. ./.OAT/Linker -v --load "deps/iw5-zones/zone/english/code_post_gfx_mp.ff" --menu-permissive --menu-no-optimization code_post_gfx_mp -- 2.34.1 From 974b3175be0dc4745609678c4244e5af864148e4 Mon Sep 17 00:00:00 2001 From: Jack Back Date: Mon, 25 Mar 2024 23:10:12 +0100 Subject: [PATCH 17/57] build: maybe now? --- .gitea/workflows/link.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.gitea/workflows/link.yml b/.gitea/workflows/link.yml index 6f46261..d526c54 100644 --- a/.gitea/workflows/link.yml +++ b/.gitea/workflows/link.yml @@ -28,8 +28,5 @@ jobs: options: --volumes-from=${{ env.JOB_CONTAINER_NAME }} run: | cd ${{ github.workspace }} - cd .OAT - ls - chmod +x Linker - cd .. + ls -al .OAT ./.OAT/Linker -v --load "deps/iw5-zones/zone/english/code_post_gfx_mp.ff" --menu-permissive --menu-no-optimization code_post_gfx_mp -- 2.34.1 From 11b3b3f9d75988fb25fff46a4ae47ebfa64c47f6 Mon Sep 17 00:00:00 2001 From: Jack Back Date: Mon, 25 Mar 2024 23:11:38 +0100 Subject: [PATCH 18/57] build: maybe now? --- .gitea/workflows/link.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.gitea/workflows/link.yml b/.gitea/workflows/link.yml index d526c54..6123a6e 100644 --- a/.gitea/workflows/link.yml +++ b/.gitea/workflows/link.yml @@ -24,9 +24,8 @@ jobs: - name: Link assets uses: addnab/docker-run-action@v3 with: - image: ubuntu:noble + image: gcc:13 options: --volumes-from=${{ env.JOB_CONTAINER_NAME }} run: | cd ${{ github.workspace }} - ls -al .OAT ./.OAT/Linker -v --load "deps/iw5-zones/zone/english/code_post_gfx_mp.ff" --menu-permissive --menu-no-optimization code_post_gfx_mp -- 2.34.1 From ddc87eaea1aac1f836d7a7195d9037b74572dfd0 Mon Sep 17 00:00:00 2001 From: Jack Back Date: Mon, 25 Mar 2024 23:13:14 +0100 Subject: [PATCH 19/57] build: maybe now? --- .gitea/workflows/link.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.gitea/workflows/link.yml b/.gitea/workflows/link.yml index 6123a6e..025675a 100644 --- a/.gitea/workflows/link.yml +++ b/.gitea/workflows/link.yml @@ -16,16 +16,16 @@ jobs: # NOTE - If LFS ever starts getting used for storing zones, switch this to true! lfs: false + - name: Install Docker + run: | + curl -fsSL https://get.docker.com -o get-docker.sh + sh get-docker.sh + - name: Setup OAT uses: diamante0018/setup-oat@main with: version: "0.10.0" - name: Link assets - uses: addnab/docker-run-action@v3 - with: - image: gcc:13 - options: --volumes-from=${{ env.JOB_CONTAINER_NAME }} - run: | - cd ${{ github.workspace }} - ./.OAT/Linker -v --load "deps/iw5-zones/zone/english/code_post_gfx_mp.ff" --menu-permissive --menu-no-optimization code_post_gfx_mp + run: | + docker run --rm -v $PWD:/workdir --workdir /workdir ubuntu:noble ./.OAT/Linker -v --load "deps/iw5-zones/zone/english/code_post_gfx_mp.ff" --menu-permissive --menu-no-optimization code_post_gfx_mp -- 2.34.1 From 77846aa874b569d58c76be0d08630a94c8802ae2 Mon Sep 17 00:00:00 2001 From: Jack Back Date: Mon, 25 Mar 2024 23:15:47 +0100 Subject: [PATCH 20/57] build: maybe now IT SHOWS??? --- .gitea/workflows/link.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/link.yml b/.gitea/workflows/link.yml index 025675a..0f7b1e0 100644 --- a/.gitea/workflows/link.yml +++ b/.gitea/workflows/link.yml @@ -28,4 +28,4 @@ jobs: - name: Link assets run: | - docker run --rm -v $PWD:/workdir --workdir /workdir ubuntu:noble ./.OAT/Linker -v --load "deps/iw5-zones/zone/english/code_post_gfx_mp.ff" --menu-permissive --menu-no-optimization code_post_gfx_mp + docker run --rm -v $PWD:/workdir --workdir /workdir ubuntu:noble sh -c "ls -al && cd .OAT && ls -al" -- 2.34.1 From 87c5859ef840d95cd73f536c578e69e425337fc3 Mon Sep 17 00:00:00 2001 From: Jack Back Date: Mon, 25 Mar 2024 23:17:31 +0100 Subject: [PATCH 21/57] build: maybe now IT SHOWS??? --- .gitea/workflows/link.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/link.yml b/.gitea/workflows/link.yml index 0f7b1e0..2cae09d 100644 --- a/.gitea/workflows/link.yml +++ b/.gitea/workflows/link.yml @@ -28,4 +28,4 @@ jobs: - name: Link assets run: | - docker run --rm -v $PWD:/workdir --workdir /workdir ubuntu:noble sh -c "ls -al && cd .OAT && ls -al" + docker run --rm -v $PWD:/workdir ubuntu:noble sh -c "ls -al && cd workdir && ls -al && cd .OAT && ls -al" -- 2.34.1 From ddbb7d5030d40455c610219193d3f56497724a6d Mon Sep 17 00:00:00 2001 From: Jack Back Date: Mon, 25 Mar 2024 23:19:47 +0100 Subject: [PATCH 22/57] build: maybe now IT SHOWS??? --- .gitea/workflows/link.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitea/workflows/link.yml b/.gitea/workflows/link.yml index 2cae09d..c31338a 100644 --- a/.gitea/workflows/link.yml +++ b/.gitea/workflows/link.yml @@ -28,4 +28,5 @@ jobs: - name: Link assets run: | - docker run --rm -v $PWD:/workdir ubuntu:noble sh -c "ls -al && cd workdir && ls -al && cd .OAT && ls -al" + ls -a + docker run --rm -v $(pwd):/workdir ubuntu:noble sh -c "ls -al && cd /workdir && ls -al && cd .OAT && ls -al" -- 2.34.1 From 6cc882350545b4b32ae480501f63dde4aeff9a52 Mon Sep 17 00:00:00 2001 From: Jack Back Date: Mon, 25 Mar 2024 23:22:15 +0100 Subject: [PATCH 23/57] build: Testing AI theories --- .gitea/workflows/link.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.gitea/workflows/link.yml b/.gitea/workflows/link.yml index c31338a..1c1e50b 100644 --- a/.gitea/workflows/link.yml +++ b/.gitea/workflows/link.yml @@ -28,5 +28,4 @@ jobs: - name: Link assets run: | - ls -a - docker run --rm -v $(pwd):/workdir ubuntu:noble sh -c "ls -al && cd /workdir && ls -al && cd .OAT && ls -al" + docker run --rm -v ${GITHUB_WORKSPACE}:/workdir --workdir workdir ubuntu:noble sh -c "ls -al" -- 2.34.1 From abad35f41033f1de7824c0c7739ab3fa92c8f7a4 Mon Sep 17 00:00:00 2001 From: Jack Back Date: Mon, 25 Mar 2024 23:22:58 +0100 Subject: [PATCH 24/57] build: Testing AI theories --- .gitea/workflows/link.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/link.yml b/.gitea/workflows/link.yml index 1c1e50b..586aaa0 100644 --- a/.gitea/workflows/link.yml +++ b/.gitea/workflows/link.yml @@ -28,4 +28,4 @@ jobs: - name: Link assets run: | - docker run --rm -v ${GITHUB_WORKSPACE}:/workdir --workdir workdir ubuntu:noble sh -c "ls -al" + docker run --rm -v ${{ github.workspace }}:/workdir --workdir workdir ubuntu:noble sh -c "ls -al" -- 2.34.1 From 48c8b4d8c7989c90a6f9d0215f5a1c77d53f40e7 Mon Sep 17 00:00:00 2001 From: Jack Back Date: Mon, 25 Mar 2024 23:24:22 +0100 Subject: [PATCH 25/57] build: Testing AI theories --- .gitea/workflows/link.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitea/workflows/link.yml b/.gitea/workflows/link.yml index 586aaa0..3bab6bd 100644 --- a/.gitea/workflows/link.yml +++ b/.gitea/workflows/link.yml @@ -28,4 +28,5 @@ jobs: - name: Link assets run: | - docker run --rm -v ${{ github.workspace }}:/workdir --workdir workdir ubuntu:noble sh -c "ls -al" + echo "${{ gitea.workspace }}" + docker run --rm -v ${{ gitea.workspace }}:/workdir --workdir workdir ubuntu:noble sh -c "ls -al" -- 2.34.1 From d72c157377bf3e99b4bdbb5d8536f49b685dd180 Mon Sep 17 00:00:00 2001 From: Jack Back Date: Mon, 25 Mar 2024 23:26:18 +0100 Subject: [PATCH 26/57] build: Testing AI theories --- .gitea/workflows/link.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.gitea/workflows/link.yml b/.gitea/workflows/link.yml index 3bab6bd..ae86501 100644 --- a/.gitea/workflows/link.yml +++ b/.gitea/workflows/link.yml @@ -28,5 +28,4 @@ jobs: - name: Link assets run: | - echo "${{ gitea.workspace }}" - docker run --rm -v ${{ gitea.workspace }}:/workdir --workdir workdir ubuntu:noble sh -c "ls -al" + docker run --rm -v ${{ gitea.workspace }}:/workspace --workdir workspace ubuntu:noble sh -c "ls -al" -- 2.34.1 From c561e199ac5f4066fd3f423081b88161da8a23bd Mon Sep 17 00:00:00 2001 From: Jack Back Date: Mon, 25 Mar 2024 23:27:36 +0100 Subject: [PATCH 27/57] build: Testing AI theories --- .gitea/workflows/link.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/link.yml b/.gitea/workflows/link.yml index ae86501..29ba05a 100644 --- a/.gitea/workflows/link.yml +++ b/.gitea/workflows/link.yml @@ -28,4 +28,4 @@ jobs: - name: Link assets run: | - docker run --rm -v ${{ gitea.workspace }}:/workspace --workdir workspace ubuntu:noble sh -c "ls -al" + docker run --rm -v ${{ gitea.workspace }}:/workspace --workdir /workspace ubuntu:noble sh -c "ls -al" -- 2.34.1 From dea43a249d3aa8567b976de77d89261453e13c29 Mon Sep 17 00:00:00 2001 From: Jack Back Date: Mon, 25 Mar 2024 23:30:20 +0100 Subject: [PATCH 28/57] build: Testing AI theories --- .gitea/workflows/link.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/link.yml b/.gitea/workflows/link.yml index 29ba05a..1e0a099 100644 --- a/.gitea/workflows/link.yml +++ b/.gitea/workflows/link.yml @@ -28,4 +28,4 @@ jobs: - name: Link assets run: | - docker run --rm -v ${{ gitea.workspace }}:/workspace --workdir /workspace ubuntu:noble sh -c "ls -al" + docker run -it --rm -v ${{ gitea.workspace }}:/workspace --workdir /workspace ubuntu:noble sh -c "ls -al" -- 2.34.1 From f9f511ebf45ed374851aebc939379f613435c202 Mon Sep 17 00:00:00 2001 From: Jack Back Date: Tue, 26 Mar 2024 17:37:23 +0100 Subject: [PATCH 29/57] balls --- .gitea/workflows/link.yml | 19 +++++++------------ test.sh | 3 +++ 2 files changed, 10 insertions(+), 12 deletions(-) create mode 100755 test.sh diff --git a/.gitea/workflows/link.yml b/.gitea/workflows/link.yml index 1e0a099..edd6e8d 100644 --- a/.gitea/workflows/link.yml +++ b/.gitea/workflows/link.yml @@ -16,16 +16,11 @@ jobs: # NOTE - If LFS ever starts getting used for storing zones, switch this to true! lfs: false - - name: Install Docker - run: | - curl -fsSL https://get.docker.com -o get-docker.sh - sh get-docker.sh - - - name: Setup OAT - uses: diamante0018/setup-oat@main + - name: Test Docker + uses: addnab/docker-run-action@v3 with: - version: "0.10.0" - - - name: Link assets - run: | - docker run -it --rm -v ${{ gitea.workspace }}:/workspace --workdir /workspace ubuntu:noble sh -c "ls -al" + image: ubuntu:noble + options: --volumes-from=${{ env.JOB_CONTAINER_NAME }} + run: | + cd ${{ github.workspace }} + ./test.sh diff --git a/test.sh b/test.sh new file mode 100755 index 0000000..ca3b9f0 --- /dev/null +++ b/test.sh @@ -0,0 +1,3 @@ +#!/bin/bash + +echo "hello" -- 2.34.1 From 3a5390a7dccdd35e07aaa91414d4a890c9f57fd3 Mon Sep 17 00:00:00 2001 From: Jack Back Date: Tue, 26 Mar 2024 17:39:10 +0100 Subject: [PATCH 30/57] second test --- test.sh => .gitea/scripts/ci.sh | 0 .gitea/workflows/link.yml | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename test.sh => .gitea/scripts/ci.sh (100%) diff --git a/test.sh b/.gitea/scripts/ci.sh similarity index 100% rename from test.sh rename to .gitea/scripts/ci.sh diff --git a/.gitea/workflows/link.yml b/.gitea/workflows/link.yml index edd6e8d..01595a6 100644 --- a/.gitea/workflows/link.yml +++ b/.gitea/workflows/link.yml @@ -23,4 +23,4 @@ jobs: options: --volumes-from=${{ env.JOB_CONTAINER_NAME }} run: | cd ${{ github.workspace }} - ./test.sh + ./.gitea/scripts/ci.sh -- 2.34.1 From 5cbefecd27eef1602d72a2d5499679d99d442789 Mon Sep 17 00:00:00 2001 From: Jack Back Date: Tue, 26 Mar 2024 17:45:12 +0100 Subject: [PATCH 31/57] test env stuff --- .gitea/scripts/ci.sh | 6 +++++- .gitea/workflows/link.yml | 4 +++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.gitea/scripts/ci.sh b/.gitea/scripts/ci.sh index ca3b9f0..d1ef0d3 100755 --- a/.gitea/scripts/ci.sh +++ b/.gitea/scripts/ci.sh @@ -1,3 +1,7 @@ #!/bin/bash -echo "hello" +# Validate OAT version +if [[ -z "$OAT_VERSION" ]]; then + echo "No OAT version was specified, please set the OAT_VERSION environment variable." + exit 1 +fi diff --git a/.gitea/workflows/link.yml b/.gitea/workflows/link.yml index 01595a6..e9af581 100644 --- a/.gitea/workflows/link.yml +++ b/.gitea/workflows/link.yml @@ -23,4 +23,6 @@ jobs: options: --volumes-from=${{ env.JOB_CONTAINER_NAME }} run: | cd ${{ github.workspace }} - ./.gitea/scripts/ci.sh + ./.gitea/scripts/ci.sh + env: + OAT_VERSION: 0.10.0 -- 2.34.1 From 15c0c204f227988470de3c9e1c59c5df300810d6 Mon Sep 17 00:00:00 2001 From: Jack Back Date: Tue, 26 Mar 2024 17:46:07 +0100 Subject: [PATCH 32/57] test env stuff --- .gitea/workflows/link.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/link.yml b/.gitea/workflows/link.yml index e9af581..365f5cc 100644 --- a/.gitea/workflows/link.yml +++ b/.gitea/workflows/link.yml @@ -25,4 +25,4 @@ jobs: cd ${{ github.workspace }} ./.gitea/scripts/ci.sh env: - OAT_VERSION: 0.10.0 + OAT_VERSION: "0.10.0" -- 2.34.1 From 7a8e1918b9455614e602d9137e4755ddd013ccf0 Mon Sep 17 00:00:00 2001 From: Jack Back Date: Tue, 26 Mar 2024 17:49:10 +0100 Subject: [PATCH 33/57] test env stuff --- .gitea/workflows/link.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/link.yml b/.gitea/workflows/link.yml index 365f5cc..8b8d2b1 100644 --- a/.gitea/workflows/link.yml +++ b/.gitea/workflows/link.yml @@ -2,6 +2,9 @@ name: link on: [push] +env: + OAT_VERSION: "0.10.0" + jobs: link-linux: name: Link assets on Linux @@ -23,6 +26,5 @@ jobs: options: --volumes-from=${{ env.JOB_CONTAINER_NAME }} run: | cd ${{ github.workspace }} + echo "OAT_VERSION=${{ env.OAT_VERSION }}" >> $GITHUB_ENV ./.gitea/scripts/ci.sh - env: - OAT_VERSION: "0.10.0" -- 2.34.1 From be6c18ef8379a6f45738d4807cb72a4607adb08e Mon Sep 17 00:00:00 2001 From: Jack Back Date: Tue, 26 Mar 2024 17:50:05 +0100 Subject: [PATCH 34/57] test env stuff --- .gitea/workflows/link.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/link.yml b/.gitea/workflows/link.yml index 8b8d2b1..0b3cc25 100644 --- a/.gitea/workflows/link.yml +++ b/.gitea/workflows/link.yml @@ -26,5 +26,5 @@ jobs: options: --volumes-from=${{ env.JOB_CONTAINER_NAME }} run: | cd ${{ github.workspace }} - echo "OAT_VERSION=${{ env.OAT_VERSION }}" >> $GITHUB_ENV + export OAT_VERSION=${{ env.OAT_VERSION }} ./.gitea/scripts/ci.sh -- 2.34.1 From f8a691269f2272451e797f50c1fa793420860f01 Mon Sep 17 00:00:00 2001 From: Jack Back Date: Tue, 26 Mar 2024 17:58:36 +0100 Subject: [PATCH 35/57] AI did this --- .gitea/scripts/ci.sh | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/.gitea/scripts/ci.sh b/.gitea/scripts/ci.sh index d1ef0d3..0871738 100755 --- a/.gitea/scripts/ci.sh +++ b/.gitea/scripts/ci.sh @@ -5,3 +5,31 @@ if [[ -z "$OAT_VERSION" ]]; then echo "No OAT version was specified, please set the OAT_VERSION environment variable." exit 1 fi + +# Construct the download URL +DOWNLOAD_URL="https://github.com/Laupetin/OpenAssetTools/releases/download/v${OAT_VERSION}/oat-linux.tar.gz" + +echo "Downloading OAT from: $DOWNLOAD_URL" + +# Define temporary directory +TEMP_DIR="/tmp/oat_download" + +# Create temporary directory if it doesn't exist +mkdir -p "$TEMP_DIR" + +# Download the tar.gz file to the temporary directory +curl -L -o "${TEMP_DIR}/oat-linux.tar.gz" "$DOWNLOAD_URL" + +# Extract the contents of the tar.gz file +tar -xzf "${TEMP_DIR}/oat-linux.tar.gz" -C "${TEMP_DIR}" + +# Copy the executables to /usr/local/bin and make them executable +sudo cp "${TEMP_DIR}/Linker" "${TEMP_DIR}/Unliker" /usr/local/bin/ +sudo chmod +x /usr/local/bin/Linker /usr/local/bin/Unliker + +# Clean up temporary directory +rm -rf "$TEMP_DIR" + +echo "OpenAssetTools version $OAT_VERSION has been installed." + +Linker --help -- 2.34.1 From 88f617dae4e43b76f6bd6b6772709ee6463a05b2 Mon Sep 17 00:00:00 2001 From: Jack Back Date: Tue, 26 Mar 2024 17:59:11 +0100 Subject: [PATCH 36/57] AI did this --- .gitea/scripts/ci.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitea/scripts/ci.sh b/.gitea/scripts/ci.sh index 0871738..f9bfb1d 100755 --- a/.gitea/scripts/ci.sh +++ b/.gitea/scripts/ci.sh @@ -24,8 +24,8 @@ curl -L -o "${TEMP_DIR}/oat-linux.tar.gz" "$DOWNLOAD_URL" tar -xzf "${TEMP_DIR}/oat-linux.tar.gz" -C "${TEMP_DIR}" # Copy the executables to /usr/local/bin and make them executable -sudo cp "${TEMP_DIR}/Linker" "${TEMP_DIR}/Unliker" /usr/local/bin/ -sudo chmod +x /usr/local/bin/Linker /usr/local/bin/Unliker +cp "${TEMP_DIR}/Linker" "${TEMP_DIR}/Unliker" /usr/local/bin/ +chmod +x /usr/local/bin/Linker /usr/local/bin/Unliker # Clean up temporary directory rm -rf "$TEMP_DIR" -- 2.34.1 From 75eaa11be0717a66e1ef3fea5a38c4f84a7ca779 Mon Sep 17 00:00:00 2001 From: Jack Back Date: Tue, 26 Mar 2024 18:00:43 +0100 Subject: [PATCH 37/57] Idid this lol ai sucks --- .gitea/scripts/ci.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitea/scripts/ci.sh b/.gitea/scripts/ci.sh index f9bfb1d..96ec22d 100755 --- a/.gitea/scripts/ci.sh +++ b/.gitea/scripts/ci.sh @@ -6,6 +6,10 @@ if [[ -z "$OAT_VERSION" ]]; then exit 1 fi +# Make sure we have Curl +apt-get update +apt-get install -y curl + # Construct the download URL DOWNLOAD_URL="https://github.com/Laupetin/OpenAssetTools/releases/download/v${OAT_VERSION}/oat-linux.tar.gz" -- 2.34.1 From ad730ddd9ddfe2304efa5c5e49a305c4bec074c8 Mon Sep 17 00:00:00 2001 From: Jack Back Date: Tue, 26 Mar 2024 18:02:33 +0100 Subject: [PATCH 38/57] typo --- .gitea/scripts/ci.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitea/scripts/ci.sh b/.gitea/scripts/ci.sh index 96ec22d..36f4d3f 100755 --- a/.gitea/scripts/ci.sh +++ b/.gitea/scripts/ci.sh @@ -28,8 +28,8 @@ curl -L -o "${TEMP_DIR}/oat-linux.tar.gz" "$DOWNLOAD_URL" tar -xzf "${TEMP_DIR}/oat-linux.tar.gz" -C "${TEMP_DIR}" # Copy the executables to /usr/local/bin and make them executable -cp "${TEMP_DIR}/Linker" "${TEMP_DIR}/Unliker" /usr/local/bin/ -chmod +x /usr/local/bin/Linker /usr/local/bin/Unliker +cp "${TEMP_DIR}/Linker" "${TEMP_DIR}/Unlinker" /usr/local/bin/ +chmod +x /usr/local/bin/Linker /usr/local/bin/Unlinker # Clean up temporary directory rm -rf "$TEMP_DIR" -- 2.34.1 From 91a70014350dd3c0cb7ab07064d16c6ee4006f1e Mon Sep 17 00:00:00 2001 From: Jack Back Date: Tue, 26 Mar 2024 18:03:49 +0100 Subject: [PATCH 39/57] typo --- .gitea/scripts/ci.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitea/scripts/ci.sh b/.gitea/scripts/ci.sh index 36f4d3f..853285d 100755 --- a/.gitea/scripts/ci.sh +++ b/.gitea/scripts/ci.sh @@ -36,4 +36,7 @@ rm -rf "$TEMP_DIR" echo "OpenAssetTools version $OAT_VERSION has been installed." +cd /usr/local +ls -la + Linker --help -- 2.34.1 From fd97b0231d050d995b4d124987e9aeeb6f51da9d Mon Sep 17 00:00:00 2001 From: Jack Back Date: Tue, 26 Mar 2024 18:04:44 +0100 Subject: [PATCH 40/57] test --- .gitea/scripts/ci.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/scripts/ci.sh b/.gitea/scripts/ci.sh index 853285d..1fb8c26 100755 --- a/.gitea/scripts/ci.sh +++ b/.gitea/scripts/ci.sh @@ -36,7 +36,7 @@ rm -rf "$TEMP_DIR" echo "OpenAssetTools version $OAT_VERSION has been installed." -cd /usr/local +cd /usr/local/bin ls -la Linker --help -- 2.34.1 From 0018f1cb573863411edabd762dc978874ca155fb Mon Sep 17 00:00:00 2001 From: Jack Back Date: Tue, 26 Mar 2024 18:06:43 +0100 Subject: [PATCH 41/57] test --- .gitea/scripts/ci.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitea/scripts/ci.sh b/.gitea/scripts/ci.sh index 1fb8c26..251a3dd 100755 --- a/.gitea/scripts/ci.sh +++ b/.gitea/scripts/ci.sh @@ -6,7 +6,7 @@ if [[ -z "$OAT_VERSION" ]]; then exit 1 fi -# Make sure we have Curl +# Make sure we have cURL apt-get update apt-get install -y curl @@ -37,6 +37,7 @@ rm -rf "$TEMP_DIR" echo "OpenAssetTools version $OAT_VERSION has been installed." cd /usr/local/bin -ls -la +file Linker +file Unlinker -Linker --help +./Linker --help -- 2.34.1 From 460451d7d58666335b7c0d5cad3b1497b48b2f59 Mon Sep 17 00:00:00 2001 From: Jack Back Date: Tue, 26 Mar 2024 18:07:22 +0100 Subject: [PATCH 42/57] test --- .gitea/scripts/ci.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitea/scripts/ci.sh b/.gitea/scripts/ci.sh index 251a3dd..a811253 100755 --- a/.gitea/scripts/ci.sh +++ b/.gitea/scripts/ci.sh @@ -6,9 +6,9 @@ if [[ -z "$OAT_VERSION" ]]; then exit 1 fi -# Make sure we have cURL +# Make sure we have cURL and file apt-get update -apt-get install -y curl +apt-get install -y curl file # Construct the download URL DOWNLOAD_URL="https://github.com/Laupetin/OpenAssetTools/releases/download/v${OAT_VERSION}/oat-linux.tar.gz" -- 2.34.1 From 284c2469fc1d572052afb47550f33a7a9e4bcc54 Mon Sep 17 00:00:00 2001 From: Jack Back Date: Tue, 26 Mar 2024 18:10:07 +0100 Subject: [PATCH 43/57] build: more docker tests --- .gitea/scripts/ci.sh | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/.gitea/scripts/ci.sh b/.gitea/scripts/ci.sh index a811253..007e77d 100755 --- a/.gitea/scripts/ci.sh +++ b/.gitea/scripts/ci.sh @@ -6,7 +6,8 @@ if [[ -z "$OAT_VERSION" ]]; then exit 1 fi -# Make sure we have cURL and file +# Make sure we have cURL (and file for debugging) +dpkg --add-architecture i386 apt-get update apt-get install -y curl file @@ -36,8 +37,4 @@ rm -rf "$TEMP_DIR" echo "OpenAssetTools version $OAT_VERSION has been installed." -cd /usr/local/bin -file Linker -file Unlinker - -./Linker --help +Linker --help -- 2.34.1 From f3a67a5140ab3e5e5655c7befa83ffb5915cb6ff Mon Sep 17 00:00:00 2001 From: Jack Back Date: Tue, 26 Mar 2024 18:12:52 +0100 Subject: [PATCH 44/57] build: more docker tests --- .gitea/workflows/link.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/link.yml b/.gitea/workflows/link.yml index 0b3cc25..4f6922c 100644 --- a/.gitea/workflows/link.yml +++ b/.gitea/workflows/link.yml @@ -22,7 +22,7 @@ jobs: - name: Test Docker uses: addnab/docker-run-action@v3 with: - image: ubuntu:noble + image: gcc:13 options: --volumes-from=${{ env.JOB_CONTAINER_NAME }} run: | cd ${{ github.workspace }} -- 2.34.1 From b226aaa33fd47bbae5aedb122031ddb3dd8e8cc3 Mon Sep 17 00:00:00 2001 From: Jack Back Date: Tue, 26 Mar 2024 18:15:59 +0100 Subject: [PATCH 45/57] build: more docker tests --- .gitea/workflows/link.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/link.yml b/.gitea/workflows/link.yml index 4f6922c..a9e5ace 100644 --- a/.gitea/workflows/link.yml +++ b/.gitea/workflows/link.yml @@ -3,7 +3,7 @@ name: link on: [push] env: - OAT_VERSION: "0.10.0" + OAT_VERSION: "0.8.3" jobs: link-linux: @@ -22,7 +22,7 @@ jobs: - name: Test Docker uses: addnab/docker-run-action@v3 with: - image: gcc:13 + image: ubuntu:noble options: --volumes-from=${{ env.JOB_CONTAINER_NAME }} run: | cd ${{ github.workspace }} -- 2.34.1 From c1f3defed9b0706a81b535608d7c00654c8c0bfc Mon Sep 17 00:00:00 2001 From: Jack Back Date: Tue, 26 Mar 2024 18:19:00 +0100 Subject: [PATCH 46/57] build: more docker tests --- .gitea/scripts/ci.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitea/scripts/ci.sh b/.gitea/scripts/ci.sh index 007e77d..e25e7ae 100755 --- a/.gitea/scripts/ci.sh +++ b/.gitea/scripts/ci.sh @@ -29,12 +29,14 @@ curl -L -o "${TEMP_DIR}/oat-linux.tar.gz" "$DOWNLOAD_URL" tar -xzf "${TEMP_DIR}/oat-linux.tar.gz" -C "${TEMP_DIR}" # Copy the executables to /usr/local/bin and make them executable -cp "${TEMP_DIR}/Linker" "${TEMP_DIR}/Unlinker" /usr/local/bin/ -chmod +x /usr/local/bin/Linker /usr/local/bin/Unlinker +cp "${TEMP_DIR}/Linker" "${TEMP_DIR}/Unlinker" . +chmod +x Linker Unlinker # Clean up temporary directory rm -rf "$TEMP_DIR" echo "OpenAssetTools version $OAT_VERSION has been installed." -Linker --help +file Linker +file Unlinker +./Linker --help -- 2.34.1 From b51d676f1b0f58d3053a5aa0ea5bcbe04eb013bc Mon Sep 17 00:00:00 2001 From: Jack Back Date: Tue, 26 Mar 2024 18:20:54 +0100 Subject: [PATCH 47/57] build: more docker tests --- .gitea/scripts/ci.sh | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.gitea/scripts/ci.sh b/.gitea/scripts/ci.sh index e25e7ae..007e77d 100755 --- a/.gitea/scripts/ci.sh +++ b/.gitea/scripts/ci.sh @@ -29,14 +29,12 @@ curl -L -o "${TEMP_DIR}/oat-linux.tar.gz" "$DOWNLOAD_URL" tar -xzf "${TEMP_DIR}/oat-linux.tar.gz" -C "${TEMP_DIR}" # Copy the executables to /usr/local/bin and make them executable -cp "${TEMP_DIR}/Linker" "${TEMP_DIR}/Unlinker" . -chmod +x Linker Unlinker +cp "${TEMP_DIR}/Linker" "${TEMP_DIR}/Unlinker" /usr/local/bin/ +chmod +x /usr/local/bin/Linker /usr/local/bin/Unlinker # Clean up temporary directory rm -rf "$TEMP_DIR" echo "OpenAssetTools version $OAT_VERSION has been installed." -file Linker -file Unlinker -./Linker --help +Linker --help -- 2.34.1 From 46bb826a5d1eefd9b8c62ec1f38451ec9c345578 Mon Sep 17 00:00:00 2001 From: Jack Back Date: Tue, 26 Mar 2024 18:36:07 +0100 Subject: [PATCH 48/57] build: more docker tests --- .gitea/scripts/ci.sh | 4 ++-- .gitea/workflows/link.yml | 9 ++++++++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/.gitea/scripts/ci.sh b/.gitea/scripts/ci.sh index 007e77d..f3a320b 100755 --- a/.gitea/scripts/ci.sh +++ b/.gitea/scripts/ci.sh @@ -9,7 +9,7 @@ fi # Make sure we have cURL (and file for debugging) dpkg --add-architecture i386 apt-get update -apt-get install -y curl file +apt-get install -y curl file libstdc++-13-dev:i386 # Construct the download URL DOWNLOAD_URL="https://github.com/Laupetin/OpenAssetTools/releases/download/v${OAT_VERSION}/oat-linux.tar.gz" @@ -37,4 +37,4 @@ rm -rf "$TEMP_DIR" echo "OpenAssetTools version $OAT_VERSION has been installed." -Linker --help +Linker -v --load "deps/iw5-zones/zone/english/code_post_gfx_mp.ff" --menu-permissive --menu-no-optimization code_post_gfx_mp diff --git a/.gitea/workflows/link.yml b/.gitea/workflows/link.yml index a9e5ace..04fb79c 100644 --- a/.gitea/workflows/link.yml +++ b/.gitea/workflows/link.yml @@ -3,7 +3,7 @@ name: link on: [push] env: - OAT_VERSION: "0.8.3" + OAT_VERSION: "0.10.0" jobs: link-linux: @@ -28,3 +28,10 @@ jobs: cd ${{ github.workspace }} export OAT_VERSION=${{ env.OAT_VERSION }} ./.gitea/scripts/ci.sh + + - name: Upload assets + uses: actions/upload-artifact@v3 + with: + name: assets + path: | + zone_out/code_post_gfx_mp/code_post_gfx_mp.ff -- 2.34.1 From 5f43ad0f654031a26cb9baa935d8f71994b8bc45 Mon Sep 17 00:00:00 2001 From: Jack Back Date: Tue, 26 Mar 2024 18:37:37 +0100 Subject: [PATCH 49/57] build: more docker tests --- .gitea/scripts/ci.sh | 5 +++++ .gitea/workflows/link.yml | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.gitea/scripts/ci.sh b/.gitea/scripts/ci.sh index f3a320b..09c9c02 100755 --- a/.gitea/scripts/ci.sh +++ b/.gitea/scripts/ci.sh @@ -37,4 +37,9 @@ rm -rf "$TEMP_DIR" echo "OpenAssetTools version $OAT_VERSION has been installed." +cd deps +ls +cd iw5-zones +ls + Linker -v --load "deps/iw5-zones/zone/english/code_post_gfx_mp.ff" --menu-permissive --menu-no-optimization code_post_gfx_mp diff --git a/.gitea/workflows/link.yml b/.gitea/workflows/link.yml index 04fb79c..483e8b9 100644 --- a/.gitea/workflows/link.yml +++ b/.gitea/workflows/link.yml @@ -19,7 +19,7 @@ jobs: # NOTE - If LFS ever starts getting used for storing zones, switch this to true! lfs: false - - name: Test Docker + - name: Link assets uses: addnab/docker-run-action@v3 with: image: ubuntu:noble -- 2.34.1 From 2eb9b7a5f564644fbbf483826109e0e14bb6a4a3 Mon Sep 17 00:00:00 2001 From: Jack Back Date: Tue, 26 Mar 2024 18:49:09 +0100 Subject: [PATCH 50/57] build: more docker tests --- .gitea/scripts/ci.sh | 2 +- .gitea/workflows/link.yml | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.gitea/scripts/ci.sh b/.gitea/scripts/ci.sh index 09c9c02..40ccce8 100755 --- a/.gitea/scripts/ci.sh +++ b/.gitea/scripts/ci.sh @@ -42,4 +42,4 @@ ls cd iw5-zones ls -Linker -v --load "deps/iw5-zones/zone/english/code_post_gfx_mp.ff" --menu-permissive --menu-no-optimization code_post_gfx_mp +Linker -v --load "./deps/iw5-zones/zone/english/code_post_gfx_mp.ff" --menu-permissive --menu-no-optimization code_post_gfx_mp diff --git a/.gitea/workflows/link.yml b/.gitea/workflows/link.yml index 483e8b9..28bb038 100644 --- a/.gitea/workflows/link.yml +++ b/.gitea/workflows/link.yml @@ -19,6 +19,10 @@ jobs: # NOTE - If LFS ever starts getting used for storing zones, switch this to true! lfs: false + - name: Make sure we have the deps + run: | + git submodule update --init --recursive + - name: Link assets uses: addnab/docker-run-action@v3 with: -- 2.34.1 From 424312bd130a6cafd3274aee08a7d154be1a0a88 Mon Sep 17 00:00:00 2001 From: Jack Back Date: Tue, 26 Mar 2024 18:49:35 +0100 Subject: [PATCH 51/57] build: more docker tests --- .gitea/scripts/ci.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitea/scripts/ci.sh b/.gitea/scripts/ci.sh index 40ccce8..c66884b 100755 --- a/.gitea/scripts/ci.sh +++ b/.gitea/scripts/ci.sh @@ -41,5 +41,8 @@ cd deps ls cd iw5-zones ls +cd zone +cd english +ls Linker -v --load "./deps/iw5-zones/zone/english/code_post_gfx_mp.ff" --menu-permissive --menu-no-optimization code_post_gfx_mp -- 2.34.1 From a0bf5aae53309a8675d046c93d28b294f35036a7 Mon Sep 17 00:00:00 2001 From: Jack Back Date: Tue, 26 Mar 2024 18:51:11 +0100 Subject: [PATCH 52/57] build: more docker tests --- .gitea/scripts/ci.sh | 8 -------- 1 file changed, 8 deletions(-) diff --git a/.gitea/scripts/ci.sh b/.gitea/scripts/ci.sh index c66884b..21f6ed2 100755 --- a/.gitea/scripts/ci.sh +++ b/.gitea/scripts/ci.sh @@ -37,12 +37,4 @@ rm -rf "$TEMP_DIR" echo "OpenAssetTools version $OAT_VERSION has been installed." -cd deps -ls -cd iw5-zones -ls -cd zone -cd english -ls - Linker -v --load "./deps/iw5-zones/zone/english/code_post_gfx_mp.ff" --menu-permissive --menu-no-optimization code_post_gfx_mp -- 2.34.1 From 129f02289f35f0580855354b91faa8007e1c10f6 Mon Sep 17 00:00:00 2001 From: Jack Back Date: Tue, 26 Mar 2024 18:53:26 +0100 Subject: [PATCH 53/57] build: more docker tests --- .gitea/scripts/ci.sh | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.gitea/scripts/ci.sh b/.gitea/scripts/ci.sh index 21f6ed2..8cb6437 100755 --- a/.gitea/scripts/ci.sh +++ b/.gitea/scripts/ci.sh @@ -37,4 +37,11 @@ rm -rf "$TEMP_DIR" echo "OpenAssetTools version $OAT_VERSION has been installed." -Linker -v --load "./deps/iw5-zones/zone/english/code_post_gfx_mp.ff" --menu-permissive --menu-no-optimization code_post_gfx_mp +cd deps +cd iw5-zones +cd zone +cd english +ls +file code_post_gfx_mp + +Linker -v --load "deps/iw5-zones/zone/english/code_post_gfx_mp.ff" --menu-permissive --menu-no-optimization code_post_gfx_mp -- 2.34.1 From cb535f04b8fd7f570a63dd863dbcb54322e5f3ff Mon Sep 17 00:00:00 2001 From: Jack Back Date: Tue, 26 Mar 2024 18:54:12 +0100 Subject: [PATCH 54/57] build: more docker tests --- .gitea/scripts/ci.sh | 7 ------- 1 file changed, 7 deletions(-) diff --git a/.gitea/scripts/ci.sh b/.gitea/scripts/ci.sh index 8cb6437..f3a320b 100755 --- a/.gitea/scripts/ci.sh +++ b/.gitea/scripts/ci.sh @@ -37,11 +37,4 @@ rm -rf "$TEMP_DIR" echo "OpenAssetTools version $OAT_VERSION has been installed." -cd deps -cd iw5-zones -cd zone -cd english -ls -file code_post_gfx_mp - Linker -v --load "deps/iw5-zones/zone/english/code_post_gfx_mp.ff" --menu-permissive --menu-no-optimization code_post_gfx_mp -- 2.34.1 From bf49cac5166dbc3663715c803ac8cfee6115e050 Mon Sep 17 00:00:00 2001 From: Jack Back Date: Tue, 26 Mar 2024 18:54:42 +0100 Subject: [PATCH 55/57] build: more docker tests --- .gitea/scripts/ci.sh | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.gitea/scripts/ci.sh b/.gitea/scripts/ci.sh index f3a320b..6e7c9a2 100755 --- a/.gitea/scripts/ci.sh +++ b/.gitea/scripts/ci.sh @@ -37,4 +37,16 @@ rm -rf "$TEMP_DIR" echo "OpenAssetTools version $OAT_VERSION has been installed." +cd deps +cd iw5-zones +cd zone +cd english +ls +file code_post_gfx_mp.ff + +cd .. +cd .. +cd .. +cd .. + Linker -v --load "deps/iw5-zones/zone/english/code_post_gfx_mp.ff" --menu-permissive --menu-no-optimization code_post_gfx_mp -- 2.34.1 From dda60d0baa3bae5465bc16b610b897de8405d394 Mon Sep 17 00:00:00 2001 From: Jack Back Date: Tue, 26 Mar 2024 19:04:22 +0100 Subject: [PATCH 56/57] build: more docker tests --- .gitea/scripts/ci.sh | 5 ++++- deps/iw5-zones | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.gitea/scripts/ci.sh b/.gitea/scripts/ci.sh index 6e7c9a2..84dab8e 100755 --- a/.gitea/scripts/ci.sh +++ b/.gitea/scripts/ci.sh @@ -22,6 +22,9 @@ TEMP_DIR="/tmp/oat_download" # Create temporary directory if it doesn't exist mkdir -p "$TEMP_DIR" +# Create bin directory +mkdir -p "$/bin" + # Download the tar.gz file to the temporary directory curl -L -o "${TEMP_DIR}/oat-linux.tar.gz" "$DOWNLOAD_URL" @@ -49,4 +52,4 @@ cd .. cd .. cd .. -Linker -v --load "deps/iw5-zones/zone/english/code_post_gfx_mp.ff" --menu-permissive --menu-no-optimization code_post_gfx_mp +Linker -v --load "./deps/iw5-zones/zone/english/code_post_gfx_mp.ff" --menu-permissive --menu-no-optimization code_post_gfx_mp diff --git a/deps/iw5-zones b/deps/iw5-zones index bd78584..d65f603 160000 --- a/deps/iw5-zones +++ b/deps/iw5-zones @@ -1 +1 @@ -Subproject commit bd78584a7e72ac992ca6ba6aaabc933c44235909 +Subproject commit d65f60376c6a92185e7e47b6dd160ada44a6a600 -- 2.34.1 From 3ee7835dfc646227c5777d7661d8e805076b5085 Mon Sep 17 00:00:00 2001 From: Jack Back Date: Tue, 26 Mar 2024 19:09:26 +0100 Subject: [PATCH 57/57] build: more docker tests --- .gitea/scripts/ci.sh | 17 ++--------------- .gitea/workflows/link.yml | 1 + 2 files changed, 3 insertions(+), 15 deletions(-) diff --git a/.gitea/scripts/ci.sh b/.gitea/scripts/ci.sh index 84dab8e..ea15882 100755 --- a/.gitea/scripts/ci.sh +++ b/.gitea/scripts/ci.sh @@ -22,9 +22,6 @@ TEMP_DIR="/tmp/oat_download" # Create temporary directory if it doesn't exist mkdir -p "$TEMP_DIR" -# Create bin directory -mkdir -p "$/bin" - # Download the tar.gz file to the temporary directory curl -L -o "${TEMP_DIR}/oat-linux.tar.gz" "$DOWNLOAD_URL" @@ -40,16 +37,6 @@ rm -rf "$TEMP_DIR" echo "OpenAssetTools version $OAT_VERSION has been installed." -cd deps -cd iw5-zones -cd zone -cd english -ls -file code_post_gfx_mp.ff - -cd .. -cd .. -cd .. -cd .. - Linker -v --load "./deps/iw5-zones/zone/english/code_post_gfx_mp.ff" --menu-permissive --menu-no-optimization code_post_gfx_mp + +Linker -v --load "./deps/iw5-zones/zone/english/localized_ui_mp.ff" --menu-permissive --menu-no-optimization localized_ui_mp diff --git a/.gitea/workflows/link.yml b/.gitea/workflows/link.yml index 28bb038..c66d861 100644 --- a/.gitea/workflows/link.yml +++ b/.gitea/workflows/link.yml @@ -39,3 +39,4 @@ jobs: name: assets path: | zone_out/code_post_gfx_mp/code_post_gfx_mp.ff + zone_out/code_post_gfx_mp/localized_ui_mp.ff -- 2.34.1