From 552ec22ddc8255d9667541b6a38db35773bcc22c Mon Sep 17 00:00:00 2001 From: Aspen Feltner Date: Tue, 20 May 2025 17:40:54 -0400 Subject: [PATCH 01/13] Create build.yml --- .github/workflows/build.yml | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 .github/workflows/build.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 0000000..1c98231 --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,26 @@ +name: Build OpenBLOX (Complete Rework) + +on: + push: + branches: [Complete-Rework] + pull_request: + branches: [Complete-Rework] + +jobs: + build-ds: + name: 🕹️ Build DS .nds + runs-on: ubuntu-latest + container: devkitpro/devkitarm + + steps: + - uses: actions/checkout@v3 + + - name: Build DS + working-directory: ./C_Engine/Makefiles + run: make -f makefile_ds + + - name: Upload OpenBLOX.nds + uses: actions/upload-artifact@v3 + with: + name: OpenBLOX.nds + path: ./C_Engine/main.nds From 5b6e4048df9b9ae0541b02ac335fd45732f95e0d Mon Sep 17 00:00:00 2001 From: Aspen Date: Tue, 20 May 2025 17:45:08 -0400 Subject: [PATCH 02/13] Update build.yml --- .github/workflows/build.yml | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1c98231..b7d0172 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,4 +1,4 @@ -name: Build OpenBLOX (Complete Rework) +name: Build OpenBLOX DS (Complete Rework) on: push: @@ -10,16 +10,19 @@ jobs: build-ds: name: 🕹️ Build DS .nds runs-on: ubuntu-latest - container: devkitpro/devkitarm + + container: + image: devkitpro/devkitarm steps: - - uses: actions/checkout@v3 + - name: Checkout repo + uses: actions/checkout@v3 - - name: Build DS + - name: Build .nds file working-directory: ./C_Engine/Makefiles run: make -f makefile_ds - - name: Upload OpenBLOX.nds + - name: Upload OpenBLOX.nds artifact uses: actions/upload-artifact@v3 with: name: OpenBLOX.nds From 2d34f0a9c7c74882083a2f805ce15ed49c314641 Mon Sep 17 00:00:00 2001 From: Aspen Date: Tue, 20 May 2025 17:47:05 -0400 Subject: [PATCH 03/13] Update build.yml --- .github/workflows/build.yml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b7d0172..f010468 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -11,16 +11,13 @@ jobs: name: 🕹️ Build DS .nds runs-on: ubuntu-latest - container: - image: devkitpro/devkitarm - steps: - name: Checkout repo uses: actions/checkout@v3 - - name: Build .nds file - working-directory: ./C_Engine/Makefiles - run: make -f makefile_ds + - name: Set up devkitARM container & build .nds + run: | + docker run --rm -v ${{ github.workspace }}:/project -w /project/C_Engine/Makefiles devkitpro/devkitarm make -f makefile_ds - name: Upload OpenBLOX.nds artifact uses: actions/upload-artifact@v3 From 78dcd317cb5e68bb15ec76f0e3b642d672d90acc Mon Sep 17 00:00:00 2001 From: Aspen Date: Tue, 20 May 2025 17:48:16 -0400 Subject: [PATCH 04/13] Update build.yml --- .github/workflows/build.yml | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f010468..798d8f8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,4 +1,4 @@ -name: Build OpenBLOX DS (Complete Rework) +name: Build OpenBLOX DS on: push: @@ -8,19 +8,22 @@ on: jobs: build-ds: - name: 🕹️ Build DS .nds runs-on: ubuntu-latest steps: - name: Checkout repo uses: actions/checkout@v3 - - name: Set up devkitARM container & build .nds + - name: Build using devkitARM container run: | - docker run --rm -v ${{ github.workspace }}:/project -w /project/C_Engine/Makefiles devkitpro/devkitarm make -f makefile_ds + docker run --rm \ + -v "${{ github.workspace }}:/src" \ + -w /src/C_Engine/Makefiles \ + devkitpro/devkitarm \ + make -f makefile_ds - - name: Upload OpenBLOX.nds artifact + - name: Upload NDS build uses: actions/upload-artifact@v3 with: name: OpenBLOX.nds - path: ./C_Engine/main.nds + path: C_Engine/main.nds From 91273d07d999eabdeb84879cd852416bb1c830fe Mon Sep 17 00:00:00 2001 From: Aspen Date: Tue, 20 May 2025 17:49:41 -0400 Subject: [PATCH 05/13] Update build.yml --- .github/workflows/build.yml | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 798d8f8..f780dc7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -11,19 +11,31 @@ jobs: runs-on: ubuntu-latest steps: - - name: Checkout repo + - name: Checkout repository uses: actions/checkout@v3 - - name: Build using devkitARM container + - name: Install devkitPro + devkitARM run: | - docker run --rm \ - -v "${{ github.workspace }}:/src" \ - -w /src/C_Engine/Makefiles \ - devkitpro/devkitarm \ - make -f makefile_ds + sudo apt update + sudo apt install -y wget gnupg curl + wget https://apt.devkitpro.org/install-devkitpro-pacman + chmod +x install-devkitpro-pacman + sudo ./install-devkitpro-pacman + sudo dkp-pacman -Syu --noconfirm + sudo dkp-pacman -S --noconfirm nds-dev - - name: Upload NDS build + - name: Set environment variables + run: | + echo "DEVKITPRO=/opt/devkitpro" >> $GITHUB_ENV + echo "DEVKITARM=/opt/devkitpro/devkitARM" >> $GITHUB_ENV + echo "/opt/devkitpro/tools/bin" >> $GITHUB_PATH + + - name: Build .nds + working-directory: ./C_Engine/Makefiles + run: make -f makefile_ds + + - name: Upload OpenBLOX.nds uses: actions/upload-artifact@v3 with: name: OpenBLOX.nds - path: C_Engine/main.nds + path: ./C_Engine/main.nds From 28f1fe128edf259c9e782d79e3f34c630a1d2a07 Mon Sep 17 00:00:00 2001 From: Aspen Date: Tue, 20 May 2025 17:52:24 -0400 Subject: [PATCH 06/13] Update build.yml --- .github/workflows/build.yml | 30 +++++++++--------------------- 1 file changed, 9 insertions(+), 21 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f780dc7..02bbae1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,4 +1,4 @@ -name: Build OpenBLOX DS +name: Build DS (Docker) on: push: @@ -14,28 +14,16 @@ jobs: - name: Checkout repository uses: actions/checkout@v3 - - name: Install devkitPro + devkitARM + - name: Run devkitARM container to build run: | - sudo apt update - sudo apt install -y wget gnupg curl - wget https://apt.devkitpro.org/install-devkitpro-pacman - chmod +x install-devkitpro-pacman - sudo ./install-devkitpro-pacman - sudo dkp-pacman -Syu --noconfirm - sudo dkp-pacman -S --noconfirm nds-dev + docker run --rm \ + -v "$PWD:/project" \ + -w /project/C_Engine/Makefiles \ + devkitpro/devkitarm \ + make -f makefile_ds - - name: Set environment variables - run: | - echo "DEVKITPRO=/opt/devkitpro" >> $GITHUB_ENV - echo "DEVKITARM=/opt/devkitpro/devkitARM" >> $GITHUB_ENV - echo "/opt/devkitpro/tools/bin" >> $GITHUB_PATH - - - name: Build .nds - working-directory: ./C_Engine/Makefiles - run: make -f makefile_ds - - - name: Upload OpenBLOX.nds + - name: Upload .nds artifact uses: actions/upload-artifact@v3 with: name: OpenBLOX.nds - path: ./C_Engine/main.nds + path: C_Engine/main.nds From ad5f6d4d4c60382841f8f16ca247bca4ae5f3690 Mon Sep 17 00:00:00 2001 From: Aspen Feltner Date: Tue, 20 May 2025 17:54:48 -0400 Subject: [PATCH 07/13] Delete build.yml --- .github/workflows/build.yml | 26 -------------------------- 1 file changed, 26 deletions(-) delete mode 100644 .github/workflows/build.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml deleted file mode 100644 index 1c98231..0000000 --- a/.github/workflows/build.yml +++ /dev/null @@ -1,26 +0,0 @@ -name: Build OpenBLOX (Complete Rework) - -on: - push: - branches: [Complete-Rework] - pull_request: - branches: [Complete-Rework] - -jobs: - build-ds: - name: 🕹️ Build DS .nds - runs-on: ubuntu-latest - container: devkitpro/devkitarm - - steps: - - uses: actions/checkout@v3 - - - name: Build DS - working-directory: ./C_Engine/Makefiles - run: make -f makefile_ds - - - name: Upload OpenBLOX.nds - uses: actions/upload-artifact@v3 - with: - name: OpenBLOX.nds - path: ./C_Engine/main.nds From 44c5d1bee791ef5d5c13b6070a4086990a9d0895 Mon Sep 17 00:00:00 2001 From: Aspen Feltner Date: Tue, 20 May 2025 18:01:47 -0400 Subject: [PATCH 08/13] Create build.yml --- .github/workflows/build.yml | 45 +++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 .github/workflows/build.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 0000000..2e38142 --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,45 @@ +name: Build OpenBLOX DS + +on: + push: + branches: [Complete-Rework] + pull_request: + branches: [Complete-Rework] + +jobs: + build-ds: + name: 🕹️ Build DS + runs-on: ubuntu-latest + + steps: + - name: Checkout repo + uses: actions/checkout@v3 + + - name: Install devkitPro pacman + run: | + sudo apt update + sudo apt install -y wget gnupg curl + wget https://apt.devkitpro.org/install-devkitpro-pacman + chmod +x install-devkitpro-pacman + sudo ./install-devkitpro-pacman + + - name: Install devkitARM and tools + run: | + sudo dkp-pacman -Syu --noconfirm + sudo dkp-pacman -S --noconfirm nds-dev + + - name: Set environment variables + run: | + echo "DEVKITPRO=/opt/devkitpro" >> $GITHUB_ENV + echo "DEVKITARM=/opt/devkitpro/devkitARM" >> $GITHUB_ENV + echo "/opt/devkitpro/tools/bin" >> $GITHUB_PATH + + - name: Build NDS + working-directory: ./C_Engine/Makefiles + run: make -f makefile_ds + + - name: Upload OpenBLOX.nds + uses: actions/upload-artifact@v3 + with: + name: OpenBLOX.nds + path: C_Engine/main.nds From 7b70b322f6b02c1aae5f821cbccf57fa2154d0a3 Mon Sep 17 00:00:00 2001 From: Aspen Date: Tue, 20 May 2025 18:03:45 -0400 Subject: [PATCH 09/13] Update build.yml --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2e38142..a5824aa 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -39,7 +39,7 @@ jobs: run: make -f makefile_ds - name: Upload OpenBLOX.nds - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: OpenBLOX.nds path: C_Engine/main.nds From 8ecc61e6f1b0fa73edcb19b98e8da46e396e5333 Mon Sep 17 00:00:00 2001 From: Aspen Date: Tue, 20 May 2025 18:07:26 -0400 Subject: [PATCH 10/13] Update build.yml --- .github/workflows/build.yml | 37 ++++++++++++------------------------- 1 file changed, 12 insertions(+), 25 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a5824aa..ea0e6ee 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -8,38 +8,25 @@ on: jobs: build-ds: - name: 🕹️ Build DS runs-on: ubuntu-latest steps: - name: Checkout repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 - - name: Install devkitPro pacman + - name: Build inside devkitARM container run: | - sudo apt update - sudo apt install -y wget gnupg curl - wget https://apt.devkitpro.org/install-devkitpro-pacman - chmod +x install-devkitpro-pacman - sudo ./install-devkitpro-pacman + docker run --rm \ + -v "${{ github.workspace }}:/project" \ + -w /project/C_Engine/Makefiles \ + devkitpro/devkitarm \ + make -f makefile_ds - - name: Install devkitARM and tools - run: | - sudo dkp-pacman -Syu --noconfirm - sudo dkp-pacman -S --noconfirm nds-dev - - - name: Set environment variables - run: | - echo "DEVKITPRO=/opt/devkitpro" >> $GITHUB_ENV - echo "DEVKITARM=/opt/devkitpro/devkitARM" >> $GITHUB_ENV - echo "/opt/devkitpro/tools/bin" >> $GITHUB_PATH - - - name: Build NDS - working-directory: ./C_Engine/Makefiles - run: make -f makefile_ds + - name: Rename NDS output + run: mv C_Engine/Makefiles/build_ds/main.nds C_Engine/OpenBLOX_Rework.nds - - name: Upload OpenBLOX.nds + - name: Upload OpenBLOX_Rework.nds uses: actions/upload-artifact@v4 with: - name: OpenBLOX.nds - path: C_Engine/main.nds + name: OpenBLOX_Rework.nds + path: C_Engine/OpenBLOX_Rework.nds From 6fe207a9d0799e49345ae97421e47aa02606a9c9 Mon Sep 17 00:00:00 2001 From: Aspen Date: Tue, 20 May 2025 18:09:04 -0400 Subject: [PATCH 11/13] Update build.yml --- .github/workflows/build.yml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ea0e6ee..8296531 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -22,11 +22,8 @@ jobs: devkitpro/devkitarm \ make -f makefile_ds - - name: Rename NDS output - run: mv C_Engine/Makefiles/build_ds/main.nds C_Engine/OpenBLOX_Rework.nds - - - name: Upload OpenBLOX_Rework.nds + - name: Upload OpenBLOX.nds uses: actions/upload-artifact@v4 with: - name: OpenBLOX_Rework.nds - path: C_Engine/OpenBLOX_Rework.nds + name: OpenBLOX.nds + path: C_Engine/main.nds From 3352ed8614ec5b4febfa472b33fe714661d43279 Mon Sep 17 00:00:00 2001 From: Aspen Date: Tue, 20 May 2025 18:11:23 -0400 Subject: [PATCH 12/13] Update build.yml --- .github/workflows/build.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8296531..c6b2785 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -22,6 +22,9 @@ jobs: devkitpro/devkitarm \ make -f makefile_ds + - name: Rename output to root for upload + run: mv C_Engine/Makefiles/build_ds/main.nds C_Engine/main.nds + - name: Upload OpenBLOX.nds uses: actions/upload-artifact@v4 with: From 7d1bc7dd5c745a4b6ee00fed7be2a683b9e8704f Mon Sep 17 00:00:00 2001 From: Aspen Date: Tue, 20 May 2025 18:13:19 -0400 Subject: [PATCH 13/13] Update build.yml --- .github/workflows/build.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c6b2785..4dfaaa0 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -22,11 +22,8 @@ jobs: devkitpro/devkitarm \ make -f makefile_ds - - name: Rename output to root for upload - run: mv C_Engine/Makefiles/build_ds/main.nds C_Engine/main.nds - - name: Upload OpenBLOX.nds uses: actions/upload-artifact@v4 with: name: OpenBLOX.nds - path: C_Engine/main.nds + path: C_Engine/Makefiles/build_ds/main.nds