From dada9fe1ec77704a6f27c451fc2beddc07322311 Mon Sep 17 00:00:00 2001 From: Refringe Date: Wed, 6 Mar 2024 16:10:05 -0500 Subject: [PATCH] Update build.yaml and Dockerfile.node --- .gitea/workflows/build.yaml | 17 +++++++---------- Dockerfile.node | 13 +++---------- 2 files changed, 10 insertions(+), 20 deletions(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index ba3c21f..54d3723 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.6 + image: refringe/spt-build-server:0.0.5 steps: - name: Clone run: | @@ -243,7 +243,7 @@ jobs: needs: [build-server, build-modules, build-launcher] runs-on: ubuntu-latest container: - image: refringe/spt-build-server:0.0.6 + image: refringe/spt-build-server:0.0.5 steps: - name: Create Directory run: mkdir -p /workspace/refringe/Build/release @@ -290,12 +290,9 @@ jobs: ls -la /workspace/refringe/Build/release.7z - name: Upload Release - run: | - mega-login $MEGA_EMAIL $MEGA_PASSWORD - mega-whoami - # Name needs to be updated. - mega-put /workspace/refringe/Build/release.7z /spt-release/SPT-3.8.0-28965.7z - mega-export -a /spt/SPT-3.8.0-28965.7z --expire=14400M | awk '{print $4}' + uses: Difegue/action-megacmd@master + with: + args: put /workspace/refringe/Build/release.7z /spt-release/SPT-3.8.0-28965.7z env: - MEGA_EMAIL: ${{ secrets.MEGA_EMAIL }} - MEGA_PASSWORD: ${{ secrets.MEGA_PASSWORD }} + USERNAME: ${{ secrets.MEGA_EMAIL }} + PASSWORD: ${{ secrets.MEGA_PASSWORD }} diff --git a/Dockerfile.node b/Dockerfile.node index 6db6bf2..8df02e5 100644 --- a/Dockerfile.node +++ b/Dockerfile.node @@ -4,17 +4,10 @@ FROM node:20.10.0 # Install necessary tools and dependencies # - git (duh) # - git-lfs (duh) -# - zstd (caching action dependency) +# - zstd (caching action dependancy) # - tree (pretty print build directory structure) -# - wget (to download megacmd) -# - gnupg (for adding MEGA.nz repo keys) -# - software-properties-common (adding repo) # - p7zip-full (the goat) RUN apt-get update && \ - apt-get install -y git git-lfs zstd tree wget gnupg software-properties-common p7zip-full && \ + apt-get install -y git git-lfs zstd tree p7zip-full && \ + apt-get clean && \ rm -rf /var/lib/apt/lists/* - -# Install the MegaCMD client -RUN wget https://mega.nz/linux/repo/Debian_12/amd64/megacmd-Debian_12_amd64.deb && \ - dpkg -i megacmd-Debian_12_amd64.deb || apt-get install -fy && \ - rm -f megacmd-Debian_12_amd64.deb