diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index ace047b..e4b16be 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.1 + image: refringe/spt-build-server:0.0.2 steps: - name: Clone run: | @@ -117,6 +117,8 @@ jobs: BUILD_TYPE="${{ steps.build-type.outputs.build_type }}" echo "Running build for $BUILD_TYPE" npm run build:$BUILD_TYPE + echo "Built..." + tree -C ./server/project/build - name: Archive Build uses: actions/upload-artifact@v3 @@ -130,7 +132,7 @@ jobs: if: needs.check-tag-exists.outputs.proceed == 'true' runs-on: ubuntu-latest container: - image: refringe/spt-build-dotnet:0.0.5 + image: refringe/spt-build-dotnet:0.0.6 steps: - name: Clone run: | @@ -198,7 +200,8 @@ jobs: run: | cd ./modules/project dotnet build - ls -la Build + echo "Built..." + tree -C ./modules/project/Build shell: bash - name: Archive Build @@ -213,7 +216,7 @@ jobs: if: needs.check-tag-exists.outputs.proceed == 'true' runs-on: ubuntu-latest container: - image: refringe/spt-build-dotnet:0.0.5 + image: refringe/spt-build-dotnet:0.0.6 steps: - name: Clone run: | diff --git a/Dockerfile.dotnet b/Dockerfile.dotnet index 2c13332..d067c22 100644 --- a/Dockerfile.dotnet +++ b/Dockerfile.dotnet @@ -4,8 +4,15 @@ FROM mcr.microsoft.com/dotnet/sdk:6.0 # Configure Node.js v20 repository RUN curl -fsSL https://deb.nodesource.com/setup_20.10 | bash -# Install necessary tools and dependencies (git, zstd, wget, jq, and p7zip-full) +# Install necessary tools and dependencies +# - git (duh) +# - zstd (caching action dependancy) +# - wget (downloading module packages) +# - jq (fetching data from JSON files) +# - p7zip-full (extracting archives) +# - nodejs (artifact action dependancy) +# - tree (pretty print build directory structure) RUN apt-get update && \ - apt-get install -y git zstd wget jq p7zip-full nodejs && \ + apt-get install -y git zstd wget jq p7zip-full nodejs tree && \ apt-get clean && \ rm -rf /var/lib/apt/lists/* diff --git a/Dockerfile.node b/Dockerfile.node index f231261..46f386e 100644 --- a/Dockerfile.node +++ b/Dockerfile.node @@ -1,7 +1,11 @@ # Use the Node v20.10.0 base image FROM node:20.10.0 -# Install necessary tools and dependencies (git, git-lfs, and zstd) +# Install necessary tools and dependencies +# - git (duh) +# - git-lfs (duh) +# - zstd (caching action dependancy) +# - tree (pretty print build directory structure) RUN apt-get update && \ apt-get install -y git git-lfs zstd && \ apt-get clean && \ diff --git a/README.md b/README.md index 896256c..e3575e9 100644 --- a/README.md +++ b/README.md @@ -75,7 +75,7 @@ Be sure to update the version number to the next available version before buildi ``` # Build and push the spt-build-server Docker image to the Docker Hub -docker build -t refringe/spt-build-server:0.0.0 -t refringe/spt-build-server:latest -f Dockerfile.server . +docker build -t refringe/spt-build-server:0.0.0 -t refringe/spt-build-server:latest -f Dockerfile.node . docker push refringe/spt-build-server --all-tags # Build and push the spt-build-dotnet Docker image to the Docker Hub