Updated GA workflows to handle release

Author: jgaa

.github/workflows/build_macos-universal.yaml

@@ -1,8 +1,11 @@
 name: Build macOS Universal Binary
+
 on:
   push:
     branches:
       - 'master'
+  release:
+    types: [published]  # Trigger on published release
 
 jobs:
   build-universal-macos:
@@ -16,7 +19,6 @@ jobs:
 
       - name: Install Dependencies
         run: |
-          # Install essential tools (native)
           brew update
           brew install cmake ninja llvm
 
@@ -27,60 +29,63 @@ jobs:
           ./bootstrap-vcpkg.sh
           echo "VCPKG_ROOT=$PWD" >> $GITHUB_ENV
           echo "$VCPKG_ROOT" >> $GITHUB_PATH
-          ls $VCPKG_ROOT
 
       - name: Install Boost for x86_64
         run: |
           $VCPKG_ROOT/vcpkg install --triplet=x64-osx
 
       - name: Install Boost for arm64
         run: |
-            $VCPKG_ROOT/vcpkg install --triplet=arm64-osx
+          $VCPKG_ROOT/vcpkg install --triplet=arm64-osx
 
       - name: Configure Build with vcpkg for x86_64
         run: |
           mkdir -p build_x86_64
           cd build_x86_64
           cmake .. -DCMAKE_BUILD_TYPE=Release -G "Ninja" \
-                   -DCMAKE_OSX_ARCHITECTURES="x86_64"\
-                   -DCMAKE_TOOLCHAIN_FILE="$VCPKG_ROOT/scripts/buildsystems/vcpkg.cmake"         
+                   -DCMAKE_OSX_ARCHITECTURES="x86_64" \
+                   -DCMAKE_TOOLCHAIN_FILE="$VCPKG_ROOT/scripts/buildsystems/vcpkg.cmake"
 
       - name: Build Project for x86_64
         run: |
           cd build_x86_64
           cmake --build .
-          # mkdir -p ../artifacts
-          # cp -v bin/shinysocks ../artifacts/shinysocks_x86_64
-          
+
       - name: Configure Build with vcpkg for arm64
         run: |
           mkdir -p build_arm64
           cd build_arm64
           cmake .. -DCMAKE_BUILD_TYPE=Release -G "Ninja" \
-                   -DCMAKE_OSX_ARCHITECTURES="arm64"\
+                   -DCMAKE_OSX_ARCHITECTURES="arm64" \
                    -DCMAKE_TOOLCHAIN_FILE="$VCPKG_ROOT/scripts/buildsystems/vcpkg.cmake"
 
       - name: Build Project for arm64
         run: |
           cd build_arm64
           cmake --build .
-          # mkdir -p ../artifacts
-          # cp -v bin/shinysocks ../artifacts/shinysocks_arm64
-      
-      - name : Combine the binaries into a universal binary
+
+      - name: Combine the binaries into a universal binary
         run: |
           mkdir -p artifacts
-          lipo -create -output artifacts/universal_binary \
+          lipo -create -output artifacts/shinysocks-macos \
             build_x86_64/bin/shinysocks \
             build_arm64/bin/shinysocks
-      
+
       - name: Verify Universal Binary
         run: |
-          file artifacts/universal_binary
+          file artifacts/shinysocks-macos
 
       - name: Archive Artifacts
         uses: actions/upload-artifact@v4
         with:
           name: logfault-macos
           path: artifacts/*
           retention-days: 1
+
+      - name: Upload Release Artifact
+        if: github.event_name == 'release'
+        uses: softprops/action-gh-release@v2
+        with:
+          files: artifacts/shinysocks-macos
+          name: shinysocks-macos
+          token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/ci.yaml

@@ -4,7 +4,9 @@ on:
   push:
   pull_request:
   schedule:
-    - cron: '0 0 1 * *' # This line schedules the workflow to run at 00:00 on the first day of every month
+    - cron: '0 0 1 * *' # Run at 00:00 on the first day of every month
+  release:
+    types: [published]  # Trigger when a release is published
 
 jobs:
   build:
@@ -14,10 +16,12 @@ jobs:
         include:
           - os: ubuntu-latest
             compiler: gcc
+            releaseArtifact: shinysocks-ubuntu
           - os: ubuntu-latest
             compiler: clang
           - os: windows-latest
             compiler: msvc
+            releaseArtifact: shinysocks-win64
           - os: macos-latest
             compiler:
 
@@ -79,7 +83,6 @@ jobs:
             ls -la build
           else
             mkdir build
-             #rm -rf build/*
           fi
           pushd build
           cmake .. -DCMAKE_BUILD_TYPE=Release -G "Ninja" -DCMAKE_TOOLCHAIN_FILE=~/vcpkg/scripts/buildsystems/vcpkg.cmake
@@ -99,21 +102,14 @@ jobs:
 
       - name: Test shinysocks
         run: |
-          # Start shinysocks in the background
           ./build/bin/shinysocks -c "" -l debug &
-          # Save its PID
           SHINYSOCKS_PID=$!
-          # Give shinysocks some time to start
           sleep 5
-          # Run curl command to verify that shinysocks works
           curl -L --socks5-hostname socks5://localhost:1080 https://raw.githubusercontent.com/jgaa/shinysocks/master/ci/test.txt
-          # Check the exit code of the curl command
           if [ $? -ne 0 ]; then
-            # If the curl command failed, fail the workflow
             echo "Curl command failed"
             exit 1
           fi
-          # Kill the shinysocks program
           kill $SHINYSOCKS_PID
         shell: bash
 
@@ -123,10 +119,17 @@ jobs:
           cp build/bin/* artifacts/
           cp shinysocks.conf artifacts/
 
-      - name: Archive artifacts
+      - name: Upload CI Artifacts
         uses: actions/upload-artifact@v4
         with:
           name: shinysocks-${{ matrix.os }}-${{ matrix.compiler }}
           path: artifacts/*
           retention-days: 1
 
+      - name: Upload Release Artifact
+        if: github.event_name == 'release' && matrix.releaseArtifact
+        uses: softprops/action-gh-release@v2
+        with:
+          files: artifacts/*
+          name: ${{ matrix.releaseArtifact }}
+          token: ${{ secrets.GITHUB_TOKEN }}