Merge branch 'master' into p2ce-volumetrics

Author: TheEnderek0

.github/workflows/build.yml

@@ -1,47 +1,84 @@
-name: FGD Build and Folder Copy
+name: Build FGD
 on:
-  pull_request:
+  push:
     branches:
       - master
+      
+  workflow_dispatch:
 
 jobs:
-  build-windows:
-    runs-on: windows-latest
+  create-release:
+
+    runs-on: ubuntu-latest
+    name: Create Release
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
+        
+      - run: git fetch --tags origin
+      
+      - name: Get previous tag
+        id: previoustag
+        uses: 'WyriHaximus/github-action-get-previous-tag@v1'
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Setup Python
-        uses: actions/setup-python@v4
+      - name: Next Monotonic Release version
+        id: next
+        uses: WyriHaximus/github-action-next-release-version@08a7476c98e8095fad1cce0e2344c7892e17d111
         with:
-          python-version: '3.10'
+          version: ${{ steps.previoustag.outputs.tag }}
 
-      - name: Install srctools
-        run: python -m pip install git+https://github.com/StrataSource/srctools.git
-
-      - name: FGD build and folder copy
-        run: .\build.bat fgd all
-
-      - name: Artifact upload
-        uses: actions/upload-artifact@v4
+      - name: Create Release
+        uses: softprops/action-gh-release@v1
+        if: ${{ github.event.inputs.version == '' }}
         with:
-          name: build_${{ runner.os }}-${{ github.sha }}
-          path: ./build/*
-          if-no-files-found: error
-
-  build-linux:
+          tag_name: ${{ steps.next.outputs.version }}
+      
+  
+  build:
     runs-on: ubuntu-latest
+    
+    needs: create-release
+    if: ${{ always() && !cancelled() && needs.create-release.result == 'success' }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
-
+        uses: actions/checkout@v4
+        
       - name: Setup Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
-          python-version: '3.10'
+          python-version: '3.13'
+          cache: 'pip'
+          cache-dependency-path: 'requirements.txt'
+
+      - name: Install dependencies
+        run: |
+          python -m pip install -r requirements.txt
 
-      - name: Install srctools
-        run: python3 -m pip install git+https://github.com/StrataSource/srctools.git
+      - uses: robinraju/release-downloader@v1
+        with:
+          repository: 'Project-Collapse-Studios/HammerAddons'
+          latest: true
+          fileName: 'patch.fgd'
+          tarBall: false
+          zipBall: false
+          out-file-path: 'downloads'
+  
+      - run: python unify_fgd.py -d ./fgd/ --extra ./downloads/patch.fgd exp -o psc.fgd P2CE SRCTOOLS
 
-      - name: FGD build and folder copy
-        run: bash ./build.sh fgd all
+      - run: git fetch --tags origin
+      
+      - name: Get previous tag
+        id: previoustag
+        uses: 'WyriHaximus/github-action-get-previous-tag@v1'
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Upload to release
+        uses: softprops/action-gh-release@v1
+        if: ${{ github.event.inputs.version == '' }}
+        with:
+          tag_name: ${{ steps.previoustag.outputs.tag }}
+          files: psc.fgd
+          fail_on_unmatched_files: true

.github/workflows/release.yml

@@ -0,0 +1,18 @@
+name: test
+on:
+  push:
+    branches:
+      - main
+      
+  workflow_dispatch:
+
+jobs:
+  create-release:
+
+    runs-on: ubuntu-latest
+    name: Create Release
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - run: echo $GITHUB_WORKSPACE