From 35649839cf733552d1edef9fce72fb9b581b7b49 Mon Sep 17 00:00:00 2001
From: Wipe <wipe.git@gmail.com>
Date: Sun, 9 May 2021 06:48:20 +0200
Subject: [PATCH 1/2] Added composite GitHub action and simple workflow using
 it

---
 .github/workflows/build.yml |  54 ++++++++++++++
 action.yml                  | 138 ++++++++++++++++++++++++++++++++++++
 2 files changed, 192 insertions(+)
 create mode 100644 .github/workflows/build.yml
 create mode 100644 action.yml

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
new file mode 100644
index 00000000..626c3d0c
--- /dev/null
+++ b/.github/workflows/build.yml
@@ -0,0 +1,54 @@
+name: Build
+
+on:
+ push:
+  branches:
+  - 'develop'
+  - 'github-action'
+  paths:
+  - '.github/workflows/build.yml'
+  - 'action.yml'
+  - 'sfall/**'
+
+jobs:
+ Build:
+  name:    sfall
+  runs-on: windows-latest
+  steps:
+
+  - name: Clone sfall
+    uses: actions/checkout@v2
+
+  # Action is used twice for self-testing only
+
+  - name: ReleaseXP build
+    id:   build1
+    uses: ./
+    with:
+     release-xp: true
+
+  - name: DevXP build
+    id:   build2
+    uses: ./
+    with:
+     dev-xp: true
+
+  - name:  Prepare artifacts
+    run:   |
+           :
+           mkdir -p ddraw/ReleaseXP
+           mkdir -p ddraw/DevXP
+
+           cp artifacts/ddraw.ini ddraw
+           cp artifacts/sfall.dat ddraw
+           cp "${{ steps.build1.outputs.release-xp }}" ddraw/ReleaseXP
+           cp "${{ steps.build2.outputs.dev-xp }}"     ddraw/DevXP
+           cp "${{ steps.build2.outputs.dev-xp-pdb }}" ddraw/DevXP
+    shell: bash
+
+  - name: Upload artifacts
+    uses: actions/upload-artifact@v2
+    with:
+     name:           ddraw
+     path:           ddraw
+     retention-days: 14
diff --git a/action.yml b/action.yml
new file mode 100644
index 00000000..4ba6f89f
--- /dev/null
+++ b/action.yml
@@ -0,0 +1,138 @@
+name:        'sfall'
+description: 'Builds sfall binaries'
+author:      '@wipe2238'
+
+###
+#
+# Example:
+#
+# - name: Build sfall
+#   id:   sfall
+#   uses: phobos2077/sfall@develop
+#   with:
+#    release-xp: true
+#
+# - name: Copy sfall to mod directory
+#   run:  copy "${{ steps.sfall.outputs.release-xp }}" "my/mod/directory/ddraw.dll"
+#
+###
+
+# While both inputs are marked as required, users needs to set only one of them (at minimum) to 'true' for action to work
+inputs:
+
+ release-xp:
+  description: 'Set to true to enable building with ReleaseXP configuration'
+  required:    true
+
+ dev-xp:
+  description: 'Set to true to enable building with DevXP configuration'
+  required:    true
+
+# Outputs are always using Windows directory separator (`\`)
+outputs:
+
+ release-xp:
+  description:  'Full path to ddraw.dll built with ReleaseXP configuration'
+  value:         ${{ steps.build-release-xp.outputs.ddraw-dll }}
+
+ dev-xp:
+  description: 'Full path to ddraw.dll built with DevXP configuration'
+  value:       ${{ steps.build-dev-xp.outputs.ddraw-dll }}
+ dev-xp-pdb:
+  description: 'Full path to ddraw.pdb built with DevXP configuration'
+  value:       ${{ steps.build-dev-xp.outputs.ddraw-pdb }}
+
+runs:
+ using: 'composite'
+ steps:
+
+ # Quick check for things which should never happen
+ - name:  Sanity checks
+   run:   |
+          if   [[ "${{ runner.os }}" != "Windows" ]]; then
+               echo "[ERROR] This action can only be used on Windows"
+               exit 1
+          elif [[ "${{ inputs.release-xp }}" != "true" ]] && [[ "${{ inputs.dev-xp }}" != "true" ]]; then
+               echo "[ERROR] At least one of following inputs must be set to 'true' -- 'release-xp', 'dev-xp'"
+               exit 1
+          #
+          elif [[ ! -d "$(cygpath --unix "$GITHUB_ACTION_PATH/sfall/")" ]]; then
+               echo "[ERROR] Solution directory not found -- 'sfall\\'"
+               exit 1
+          elif [[ ! -f "$(cygpath --unix "$GITHUB_ACTION_PATH/sfall/ddraw.sln")" ]]; then
+               echo "[ERROR] Solution file not found -- 'sfall\\ddraw.sln'"
+               exit 1
+          fi
+          #
+   shell: bash
+
+ # DXSDK directory must be prepared only once, in case action is used N times
+ # Using `.lib` suffix to make sure directory is ignored by git in exotic scenarios
+ # Using `::set-output` to make sure workflow environment remains unchanged
+ - name:  Prepare DXSDK directory
+   id:    dxsdk
+   run:   |
+          DXSDK_DIR="$GITHUB_ACTION_PATH/sfall/DXSDK.lib"
+          if [[ ! -d "$DXSDK_DIR" ]]; then
+             echo "::group::Prepare DXSDK directory"
+             #
+             git clone --quiet https://github.com/NovaRain/DXSDK_Collection.git "$DXSDK_DIR"
+             cp "$DXSDK_DIR/DXSDK_Aug2007/Lib/x86/dinput.lib" "$DXSDK_DIR/DXSDK_Jun2010/Lib/x86/"
+             #
+             echo "::endgroup::"
+          fi
+          echo "::set-output name=dir::$(cygpath --windows "$DXSDK_DIR/DXSDK_Jun2010/")"
+   shell: bash
+
+ # MSBuild is not in PATH on Windows machines
+ # Using `::set-output` to make sure workflow environment remains unchanged
+ - name:  Prepare MSBuild
+   id:    msbuild
+   run:   |
+          echo "::group::Prepare MSBuild"
+
+          MSBUILD_EXE="$("/c/Program Files (x86)/Microsoft Visual Studio/Installer/vswhere.exe" -latest -requires Microsoft.Component.MSBuild -find MSBuild/**/Bin/MSBuild.exe)"
+          echo "::set-output name=exe::$MSBUILD_EXE"
+
+          echo "::endgroup::"
+   shell: bash
+
+ # Creating empty `PostBuild.cmd` to avoid false-positive build error
+ - name:  Build ReleaseXP
+   id:    build-release-xp
+   run:   |
+          if [[ "${{ inputs.release-xp }}" == "true" ]]; then
+             echo ::group::Build ReleaseXP
+
+             #
+             echo "@echo off" > "$GITHUB_ACTION_PATH/sfall/PostBuild.cmd"
+             "${{ steps.msbuild.outputs.exe }}" "$GITHUB_ACTION_PATH/sfall/ddraw.sln" -p:Configuration=ReleaseXP -p:Platform=Win32 -p:PlatformToolset=v140_xp
+             #
+             echo "::set-output name=ddraw-dll::$(cygpath --windows "$GITHUB_ACTION_PATH/sfall/ReleaseXP/ddraw.dll")"
+
+             echo "::endgroup::"
+          fi
+   env:
+    DXSDK_DIR: ${{ steps.dxsdk.outputs.dir }}
+   shell: bash
+
+ # Creating empty `PostBuild.cmd` to avoid false-positive build error
+ - name: Build DevXP
+   id:   build-dev-xp
+   run:   |
+          :
+          if [[ "${{ inputs.dev-xp }}" == "true" ]]; then
+             echo "::group::Build DevXP"
+
+             #
+             echo "@echo off" > "$GITHUB_ACTION_PATH/sfall/PostBuild.cmd"
+             "${{ steps.msbuild.outputs.exe }}" "$GITHUB_ACTION_PATH/sfall/ddraw.sln" -p:Configuration=DevXP -p:Platform=Win32 -p:PlatformToolset=v140_xp
+             #
+             echo "::set-output name=ddraw-dll::$(cygpath --windows "$GITHUB_ACTION_PATH/sfall/DevXP/ddraw.dll")"
+             echo "::set-output name=ddraw-pdb::$(cygpath --windows "$GITHUB_ACTION_PATH/sfall/DevXP/ddraw.pdb")"
+
+             echo "::endgroup::"
+          fi
+   env:
+    DXSDK_DIR: ${{ steps.dxsdk.outputs.dir }}
+   shell: bash

From cf67e182b3dc248a823c9523f6403543b324da13 Mon Sep 17 00:00:00 2001
From: Wipe <wipe.git@gmail.com>
Date: Sun, 6 Jun 2021 02:01:59 +0200
Subject: [PATCH 2/2] Excluded DevXP build from artifact

---
 .github/workflows/build.yml | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 626c3d0c..ce59b19c 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -20,30 +20,27 @@ jobs:
     uses: actions/checkout@v2
 
   # Action is used twice for self-testing only
+  # DevXP build results are intentionally *not* included in artifact
 
   - name: ReleaseXP build
-    id:   build1
+    id:   build
     uses: ./
     with:
      release-xp: true
 
   - name: DevXP build
-    id:   build2
     uses: ./
     with:
      dev-xp: true
 
-  - name:  Prepare artifacts
+  - name:  Prepare artifact
     run:   |
            :
-           mkdir -p ddraw/ReleaseXP
-           mkdir -p ddraw/DevXP
+           mkdir -p ddraw
 
            cp artifacts/ddraw.ini ddraw
            cp artifacts/sfall.dat ddraw
-           cp "${{ steps.build1.outputs.release-xp }}" ddraw/ReleaseXP
-           cp "${{ steps.build2.outputs.dev-xp }}"     ddraw/DevXP
-           cp "${{ steps.build2.outputs.dev-xp-pdb }}" ddraw/DevXP
+           cp "${{ steps.build.outputs.release-xp }}" ddraw
     shell: bash
 
   - name: Upload artifacts