From a4d042b85d00b5f5749e845370022a0c3e3d8a4a Mon Sep 17 00:00:00 2001 From: Refringe Date: Tue, 5 Mar 2024 22:28:59 -0500 Subject: [PATCH] Revert "Update build.yaml and Dockerfile.node" This reverts commit 36f871d5a8e3c03feafa0e0a09ec5c620783b183. --- .gitea/workflows/build.yaml | 33 +++++++-------------------------- Dockerfile.node | 3 +-- 2 files changed, 8 insertions(+), 28 deletions(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index af1691c..68e08ff 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -40,7 +40,7 @@ jobs: if: needs.check-tag-exists.outputs.proceed == 'true' runs-on: ubuntu-latest container: - image: refringe/spt-build-server:0.0.4 + image: refringe/spt-build-server:0.0.3 steps: - name: Clone run: | @@ -121,17 +121,11 @@ jobs: tree -C /workspace/refringe/Build/server/project/build shell: bash - - name: Compress Server Build Folder - run: | - cd /workspace/refringe/Build/server/project/build - 7z a -mx=9 -m0=lzma2 ../server-build.7z ./* - echo "Server build folder compressed." - - - name: Archive Server Build + - name: Archive Build uses: actions/upload-artifact@v3 with: name: server-build - path: /workspace/refringe/Build/server/project/server-build.7z + path: /workspace/refringe/Build/server/project/build/ overwrite: true build-modules: @@ -211,20 +205,13 @@ jobs: tree /workspace/refringe/Build/modules/project/Build shell: bash - - name: Compress Modules Build Folder - run: | - cd /workspace/refringe/Build/modules/project/Build - 7z a -mx=9 -m0=lzma2 ../modules-build.7z ./* - echo "Modules build folder compressed." - - - name: Archive Modules Build + - name: Archive Build uses: actions/upload-artifact@v3 with: name: modules-build - path: /workspace/refringe/Build/modules/project/modules-build.7z + path: /workspace/refringe/Build/modules/project/Build overwrite: true - build-launcher: needs: check-tag-exists if: needs.check-tag-exists.outputs.proceed == 'true' @@ -245,15 +232,9 @@ jobs: tree /workspace/refringe/Build/launcher/project/Build shell: bash - - name: Compress Launcher Build Folder - run: | - cd /workspace/refringe/Build/launcher/project/Build - 7z a -mx=9 -m0=lzma2 ../launcher-build.7z ./* - echo "Launcher build folder compressed." - - - name: Archive Launcher Build + - name: Archive Build uses: actions/upload-artifact@v3 with: name: launcher-build - path: /workspace/refringe/Build/launcher/project/launcher-build.7z + path: /workspace/refringe/Build/launcher/project/Build overwrite: true diff --git a/Dockerfile.node b/Dockerfile.node index 388c58a..7fc5953 100644 --- a/Dockerfile.node +++ b/Dockerfile.node @@ -5,9 +5,8 @@ FROM node:20.10.0 # - git (duh) # - git-lfs (duh) # - zstd (caching action dependancy) -# - p7zip-full (creating archives) # - tree (pretty print build directory structure) RUN apt-get update && \ - apt-get install -y git git-lfs zstd p7zip-full tree && \ + apt-get install -y git git-lfs zstd tree && \ apt-get clean && \ rm -rf /var/lib/apt/lists/*