From 9c4f8dfc97dc106b054191399bd5f320c111b179 Mon Sep 17 00:00:00 2001
From: Skye Deving <76892045+skyedeving@users.noreply.github.com>
Date: Tue, 5 Jan 2021 19:30:22 -0600
Subject: Create cmake.yml to run tests on github actions

---
 .github/workflows/cmake.yml | 77 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 77 insertions(+)
 create mode 100644 .github/workflows/cmake.yml

(limited to '.github/workflows')

diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
new file mode 100644
index 0000000..da2ae56
--- /dev/null
+++ b/.github/workflows/cmake.yml
@@ -0,0 +1,77 @@
+name: CMake
+
+on: [push]
+
+env:
+  # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
+  BUILD_TYPE: Release
+
+jobs:
+  build:
+    # The CMake configure and build commands are platform agnostic and should work equally
+    # well on Windows or Mac.  You can convert this to a matrix build if you need
+    # cross-platform coverage.
+    # See: https://docs.github.com/en/free-pro-team@latest/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix
+    runs-on: ubuntu-20.04
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Install catch2
+      run: |
+        curl -L https://github.com/catchorg/Catch2/archive/v2.13.4.tar.gz -o catch2.tar.gz
+        tar xvf catch2.tar.gz
+        cd Catch2-2.13.4
+        cmake -Bbuild -H. -DBUILD_TESTING=OFF
+        sudo cmake --build build/ --target install
+
+    - name: Fetch external libs
+      run: |
+        # Download
+        curl http://www.un4seen.com/files/bass24-linux.zip -o bass_linux.zip
+        curl http://www.un4seen.com/files/bassopus24-linux.zip -o bassopus_linux.zip
+        curl -L https://github.com/discordapp/discord-rpc/releases/download/v3.4.0/discord-rpc-linux.zip -o discord_rpc_linux.zip
+        curl -L https://github.com/Skycoder42/QtApng/releases/download/1.1.0-5/build_gcc_64_5.12.0.tar.xz -o apng.tar.xz
+        # Extract
+        unzip bass_linux.zip
+        unzip bassopus_linux.zip
+        unzip discord_rpc_linux.zip
+        tar -xvf apng.tar.xz
+        # Copy
+        cp x64/libbass.so lib
+        cp x64/libbassopus.so lib
+        cp discord-rpc/linux-dynamic/lib/libdiscord-rpc.so lib
+        cp gcc_64/plugins/imageformats/libqapng.so lib
+
+    - name: Install Qt5
+      run: sudo apt update -y && sudo apt install -y qt5-default
+
+    - name: Create Build Environment
+      # Some projects don't allow in-source building, so create a separate build directory
+      # We'll use this as our working directory for all subsequent commands
+      run: cmake -E make_directory ${{github.workspace}}/build
+
+    - name: Configure CMake
+      # Use a bash shell so we can use the same syntax for environment variable
+      # access regardless of the host operating system
+      shell: bash
+      working-directory: ${{github.workspace}}/build
+      # Note the current convention is to use the -S and -B options here to specify source
+      # and build directories, but this is only available with CMake 3.13 and higher.
+      # The CMake binaries on the Github Actions machines are (as of this writing) 3.12
+      run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE
+
+    - name: Build
+      working-directory: ${{github.workspace}}/build
+      shell: bash
+      # Execute the build.  You can specify a specific target with "--target <NAME>"
+      run: cmake --build . --config $BUILD_TYPE --target test
+
+    - name: Copy libs to test directory
+      run: cp ${{github.workspace}}/lib/* ${{github.workspace}}/build/test/
+
+    - name: Test
+      working-directory: ${{github.workspace}}/build/test
+      shell: bash
+      # Skipping tests for bass since no audio device
+      run: |
+        ./test ~[bass]
-- 
cgit 


From 8da71b651037c3572a1c799341af964636b9acbb Mon Sep 17 00:00:00 2001
From: Skye Deving <76892045+skyedeving@users.noreply.github.com>
Date: Wed, 6 Jan 2021 00:48:39 -0600
Subject: Install QtApng dependency

---
 .github/workflows/cmake.yml | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to '.github/workflows')

diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
index da2ae56..5f3d362 100644
--- a/.github/workflows/cmake.yml
+++ b/.github/workflows/cmake.yml
@@ -45,6 +45,13 @@ jobs:
     - name: Install Qt5
       run: sudo apt update -y && sudo apt install -y qt5-default
 
+    - name: Install QtApng
+      run: |
+        git clone https://github.com/Skycoder42/QtApng
+        cd QtApng
+        qmake
+        sudo make install
+
     - name: Create Build Environment
       # Some projects don't allow in-source building, so create a separate build directory
       # We'll use this as our working directory for all subsequent commands
-- 
cgit 


From 7b7da4e391ef72e3b35a0df417a558979fe9636c Mon Sep 17 00:00:00 2001
From: Skye Deving <76892045+skyedeving@users.noreply.github.com>
Date: Wed, 6 Jan 2021 00:55:51 -0600
Subject: Try fix build

---
 .github/workflows/cmake.yml | 1 +
 1 file changed, 1 insertion(+)

(limited to '.github/workflows')

diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
index 5f3d362..48451ab 100644
--- a/.github/workflows/cmake.yml
+++ b/.github/workflows/cmake.yml
@@ -50,6 +50,7 @@ jobs:
         git clone https://github.com/Skycoder42/QtApng
         cd QtApng
         qmake
+        make
         sudo make install
 
     - name: Create Build Environment
-- 
cgit 


From cf0a18a51376a49eb6c08aefc14fcf6ba5e2edd1 Mon Sep 17 00:00:00 2001
From: Skye Deving <76892045+skyedeving@users.noreply.github.com>
Date: Wed, 6 Jan 2021 01:31:34 -0600
Subject: Check if this is not required now

---
 .github/workflows/cmake.yml | 3 ---
 1 file changed, 3 deletions(-)

(limited to '.github/workflows')

diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
index 48451ab..8cf1799 100644
--- a/.github/workflows/cmake.yml
+++ b/.github/workflows/cmake.yml
@@ -30,17 +30,14 @@ jobs:
         curl http://www.un4seen.com/files/bass24-linux.zip -o bass_linux.zip
         curl http://www.un4seen.com/files/bassopus24-linux.zip -o bassopus_linux.zip
         curl -L https://github.com/discordapp/discord-rpc/releases/download/v3.4.0/discord-rpc-linux.zip -o discord_rpc_linux.zip
-        curl -L https://github.com/Skycoder42/QtApng/releases/download/1.1.0-5/build_gcc_64_5.12.0.tar.xz -o apng.tar.xz
         # Extract
         unzip bass_linux.zip
         unzip bassopus_linux.zip
         unzip discord_rpc_linux.zip
-        tar -xvf apng.tar.xz
         # Copy
         cp x64/libbass.so lib
         cp x64/libbassopus.so lib
         cp discord-rpc/linux-dynamic/lib/libdiscord-rpc.so lib
-        cp gcc_64/plugins/imageformats/libqapng.so lib
 
     - name: Install Qt5
       run: sudo apt update -y && sudo apt install -y qt5-default
-- 
cgit 


From 0064eb692f2f544ffba47cc4323c23341196605e Mon Sep 17 00:00:00 2001
From: Skye Deving <76892045+skyedeving@users.noreply.github.com>
Date: Wed, 6 Jan 2021 01:38:27 -0600
Subject: Check if copying libs over is unnecessary

---
 .github/workflows/cmake.yml | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to '.github/workflows')

diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
index 8cf1799..adff7bc 100644
--- a/.github/workflows/cmake.yml
+++ b/.github/workflows/cmake.yml
@@ -71,12 +71,8 @@ jobs:
       # Execute the build.  You can specify a specific target with "--target <NAME>"
       run: cmake --build . --config $BUILD_TYPE --target test
 
-    - name: Copy libs to test directory
-      run: cp ${{github.workspace}}/lib/* ${{github.workspace}}/build/test/
-
     - name: Test
       working-directory: ${{github.workspace}}/build/test
       shell: bash
       # Skipping tests for bass since no audio device
-      run: |
-        ./test ~[bass]
+      run: ./test ~[bass]
-- 
cgit 


From ed7863f2fce7c629ee79ab13df302acbf8ac0a3a Mon Sep 17 00:00:00 2001
From: Skye Deving <76892045+skyedeving@users.noreply.github.com>
Date: Thu, 7 Jan 2021 03:28:07 -0600
Subject: Add env variable to indicate no screen

---
 .github/workflows/cmake.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to '.github/workflows')

diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
index adff7bc..5573453 100644
--- a/.github/workflows/cmake.yml
+++ b/.github/workflows/cmake.yml
@@ -75,4 +75,4 @@ jobs:
       working-directory: ${{github.workspace}}/build/test
       shell: bash
       # Skipping tests for bass since no audio device
-      run: ./test ~[bass]
+      run: QT_QPA_PLATFORM=offscreen ./test ~[bass]
-- 
cgit 


From 9363246ca1b03a23f7fa99a02f8adcc347d18e8c Mon Sep 17 00:00:00 2001
From: Skye Deving <76892045+skyedeving@users.noreply.github.com>
Date: Thu, 7 Jan 2021 03:40:41 -0600
Subject: Ignore tests with noci tag

---
 .github/workflows/cmake.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to '.github/workflows')

diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
index 5573453..408e32a 100644
--- a/.github/workflows/cmake.yml
+++ b/.github/workflows/cmake.yml
@@ -75,4 +75,4 @@ jobs:
       working-directory: ${{github.workspace}}/build/test
       shell: bash
       # Skipping tests for bass since no audio device
-      run: QT_QPA_PLATFORM=offscreen ./test ~[bass]
+      run: QT_QPA_PLATFORM=offscreen ./test ~[bass] ~[noci]
-- 
cgit 


From cbdeea00109fa8b7bd052653938ac106514c1133 Mon Sep 17 00:00:00 2001
From: Skye Deving <76892045+skyedeving@users.noreply.github.com>
Date: Thu, 7 Jan 2021 04:29:49 -0600
Subject: Add test resources in and enable tests

---
 .github/workflows/cmake.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to '.github/workflows')

diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
index 408e32a..340bc7e 100644
--- a/.github/workflows/cmake.yml
+++ b/.github/workflows/cmake.yml
@@ -75,4 +75,6 @@ jobs:
       working-directory: ${{github.workspace}}/build/test
       shell: bash
       # Skipping tests for bass since no audio device
-      run: QT_QPA_PLATFORM=offscreen ./test ~[bass] ~[noci]
+      run: |
+        ln -s ../../test/*.png .
+        QT_QPA_PLATFORM=offscreen ./test ~[bass] ~[noci]
-- 
cgit 


From d73acf4d0d138efa7e85ed45c2f2df3ef2b99d96 Mon Sep 17 00:00:00 2001
From: Skye Deving <76892045+skyedeving@users.noreply.github.com>
Date: Thu, 7 Jan 2021 04:44:10 -0600
Subject: Use noci tag for disabling bass test

---
 .github/workflows/cmake.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to '.github/workflows')

diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
index 340bc7e..d28b9b0 100644
--- a/.github/workflows/cmake.yml
+++ b/.github/workflows/cmake.yml
@@ -74,7 +74,6 @@ jobs:
     - name: Test
       working-directory: ${{github.workspace}}/build/test
       shell: bash
-      # Skipping tests for bass since no audio device
       run: |
         ln -s ../../test/*.png .
-        QT_QPA_PLATFORM=offscreen ./test ~[bass] ~[noci]
+        QT_QPA_PLATFORM=offscreen ./test ~[noci]
-- 
cgit 


From 32cf9e11b7335de3f04f97f0cd5b1c0e0f21fb4c Mon Sep 17 00:00:00 2001
From: Skye Deving <76892045+skyedeving@users.noreply.github.com>
Date: Sat, 9 Jan 2021 11:45:53 -0600
Subject: Build with C++20

---
 .github/workflows/cmake.yml | 3 +++
 1 file changed, 3 insertions(+)

(limited to '.github/workflows')

diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
index d28b9b0..785c5ef 100644
--- a/.github/workflows/cmake.yml
+++ b/.github/workflows/cmake.yml
@@ -59,6 +59,9 @@ jobs:
       # Use a bash shell so we can use the same syntax for environment variable
       # access regardless of the host operating system
       shell: bash
+      env:
+        CC: gcc-10
+        CXX: g++-10
       working-directory: ${{github.workspace}}/build
       # Note the current convention is to use the -S and -B options here to specify source
       # and build directories, but this is only available with CMake 3.13 and higher.
-- 
cgit 


From 76e15de6e882a1dcb67271e4f1c3f8db751d9c7e Mon Sep 17 00:00:00 2001
From: Skye Deving <76892045+skyedeving@users.noreply.github.com>
Date: Sat, 9 Jan 2021 12:02:59 -0600
Subject: Rename workflows and start testing one for builds

---
 .github/workflows/build.yml | 80 +++++++++++++++++++++++++++++++++++++++++++
 .github/workflows/cmake.yml | 82 ---------------------------------------------
 .github/workflows/test.yml  | 82 +++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 162 insertions(+), 82 deletions(-)
 create mode 100644 .github/workflows/build.yml
 delete mode 100644 .github/workflows/cmake.yml
 create mode 100644 .github/workflows/test.yml

(limited to '.github/workflows')

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
new file mode 100644
index 0000000..82eaad6
--- /dev/null
+++ b/.github/workflows/build.yml
@@ -0,0 +1,80 @@
+name: build
+
+on: [push]
+
+env:
+  # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
+  BUILD_TYPE: Release
+
+jobs:
+  build:
+    # The CMake configure and build commands are platform agnostic and should work equally
+    # well on Windows or Mac.  You can convert this to a matrix build if you need
+    # cross-platform coverage.
+    # See: https://docs.github.com/en/free-pro-team@latest/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix
+    runs-on: ubuntu-20.04
+
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Fetch external libs
+      run: |
+        # Download
+        curl http://www.un4seen.com/files/bass24-linux.zip -o bass_linux.zip
+        curl http://www.un4seen.com/files/bassopus24-linux.zip -o bassopus_linux.zip
+        curl -L https://github.com/discordapp/discord-rpc/releases/download/v3.4.0/discord-rpc-linux.zip -o discord_rpc_linux.zip
+        # Extract
+        unzip bass_linux.zip
+        unzip bassopus_linux.zip
+        unzip discord_rpc_linux.zip
+        # Copy
+        cp x64/libbass.so lib
+        cp x64/libbassopus.so lib
+        cp discord-rpc/linux-dynamic/lib/libdiscord-rpc.so lib
+
+    - name: Install Qt5
+      run: sudo apt update -y && sudo apt install -y qt5-default
+
+    - name: Install QtApng
+      run: |
+        git clone https://github.com/Skycoder42/QtApng
+        cd QtApng
+        qmake
+        make
+        sudo make install
+
+    - name: Create Build Environment
+      # Some projects don't allow in-source building, so create a separate build directory
+      # We'll use this as our working directory for all subsequent commands
+      run: cmake -E make_directory ${{github.workspace}}/build
+
+    - name: Configure CMake
+      # Use a bash shell so we can use the same syntax for environment variable
+      # access regardless of the host operating system
+      shell: bash
+      env:
+        CC: gcc-10
+        CXX: g++-10
+      working-directory: ${{github.workspace}}/build
+      # Note the current convention is to use the -S and -B options here to specify source
+      # and build directories, but this is only available with CMake 3.13 and higher.
+      # The CMake binaries on the Github Actions machines are (as of this writing) 3.12
+      run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE
+
+    - name: Build
+      working-directory: ${{github.workspace}}/build
+      shell: bash
+      # Execute the build.  You can specify a specific target with "--target <NAME>"
+      run: cmake --build . --config $BUILD_TYPE Attorney_Online
+
+    - name: Strip
+      working-directory: ${{github.workspace}}/build
+      shell: bash
+      run: strip -s Attorney_Online
+
+    - name: Upload Artifact
+      working-directory: ${{github.workspace}}/build
+      uses: actions/upload-artifact@v2
+      with:
+        name: Attorney_Online
+        path: Attorney_Online
diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
deleted file mode 100644
index 785c5ef..0000000
--- a/.github/workflows/cmake.yml
+++ /dev/null
@@ -1,82 +0,0 @@
-name: CMake
-
-on: [push]
-
-env:
-  # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
-  BUILD_TYPE: Release
-
-jobs:
-  build:
-    # The CMake configure and build commands are platform agnostic and should work equally
-    # well on Windows or Mac.  You can convert this to a matrix build if you need
-    # cross-platform coverage.
-    # See: https://docs.github.com/en/free-pro-team@latest/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix
-    runs-on: ubuntu-20.04
-    steps:
-    - uses: actions/checkout@v2
-
-    - name: Install catch2
-      run: |
-        curl -L https://github.com/catchorg/Catch2/archive/v2.13.4.tar.gz -o catch2.tar.gz
-        tar xvf catch2.tar.gz
-        cd Catch2-2.13.4
-        cmake -Bbuild -H. -DBUILD_TESTING=OFF
-        sudo cmake --build build/ --target install
-
-    - name: Fetch external libs
-      run: |
-        # Download
-        curl http://www.un4seen.com/files/bass24-linux.zip -o bass_linux.zip
-        curl http://www.un4seen.com/files/bassopus24-linux.zip -o bassopus_linux.zip
-        curl -L https://github.com/discordapp/discord-rpc/releases/download/v3.4.0/discord-rpc-linux.zip -o discord_rpc_linux.zip
-        # Extract
-        unzip bass_linux.zip
-        unzip bassopus_linux.zip
-        unzip discord_rpc_linux.zip
-        # Copy
-        cp x64/libbass.so lib
-        cp x64/libbassopus.so lib
-        cp discord-rpc/linux-dynamic/lib/libdiscord-rpc.so lib
-
-    - name: Install Qt5
-      run: sudo apt update -y && sudo apt install -y qt5-default
-
-    - name: Install QtApng
-      run: |
-        git clone https://github.com/Skycoder42/QtApng
-        cd QtApng
-        qmake
-        make
-        sudo make install
-
-    - name: Create Build Environment
-      # Some projects don't allow in-source building, so create a separate build directory
-      # We'll use this as our working directory for all subsequent commands
-      run: cmake -E make_directory ${{github.workspace}}/build
-
-    - name: Configure CMake
-      # Use a bash shell so we can use the same syntax for environment variable
-      # access regardless of the host operating system
-      shell: bash
-      env:
-        CC: gcc-10
-        CXX: g++-10
-      working-directory: ${{github.workspace}}/build
-      # Note the current convention is to use the -S and -B options here to specify source
-      # and build directories, but this is only available with CMake 3.13 and higher.
-      # The CMake binaries on the Github Actions machines are (as of this writing) 3.12
-      run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE
-
-    - name: Build
-      working-directory: ${{github.workspace}}/build
-      shell: bash
-      # Execute the build.  You can specify a specific target with "--target <NAME>"
-      run: cmake --build . --config $BUILD_TYPE --target test
-
-    - name: Test
-      working-directory: ${{github.workspace}}/build/test
-      shell: bash
-      run: |
-        ln -s ../../test/*.png .
-        QT_QPA_PLATFORM=offscreen ./test ~[noci]
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
new file mode 100644
index 0000000..dadaa23
--- /dev/null
+++ b/.github/workflows/test.yml
@@ -0,0 +1,82 @@
+name: test
+
+on: [push]
+
+env:
+  # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
+  BUILD_TYPE: Release
+
+jobs:
+  build:
+    # The CMake configure and build commands are platform agnostic and should work equally
+    # well on Windows or Mac.  You can convert this to a matrix build if you need
+    # cross-platform coverage.
+    # See: https://docs.github.com/en/free-pro-team@latest/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix
+    runs-on: ubuntu-20.04
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Install catch2
+      run: |
+        curl -L https://github.com/catchorg/Catch2/archive/v2.13.4.tar.gz -o catch2.tar.gz
+        tar xvf catch2.tar.gz
+        cd Catch2-2.13.4
+        cmake -Bbuild -H. -DBUILD_TESTING=OFF
+        sudo cmake --build build/ --target install
+
+    - name: Fetch external libs
+      run: |
+        # Download
+        curl http://www.un4seen.com/files/bass24-linux.zip -o bass_linux.zip
+        curl http://www.un4seen.com/files/bassopus24-linux.zip -o bassopus_linux.zip
+        curl -L https://github.com/discordapp/discord-rpc/releases/download/v3.4.0/discord-rpc-linux.zip -o discord_rpc_linux.zip
+        # Extract
+        unzip bass_linux.zip
+        unzip bassopus_linux.zip
+        unzip discord_rpc_linux.zip
+        # Copy
+        cp x64/libbass.so lib
+        cp x64/libbassopus.so lib
+        cp discord-rpc/linux-dynamic/lib/libdiscord-rpc.so lib
+
+    - name: Install Qt5
+      run: sudo apt update -y && sudo apt install -y qt5-default
+
+    - name: Install QtApng
+      run: |
+        git clone https://github.com/Skycoder42/QtApng
+        cd QtApng
+        qmake
+        make
+        sudo make install
+
+    - name: Create Build Environment
+      # Some projects don't allow in-source building, so create a separate build directory
+      # We'll use this as our working directory for all subsequent commands
+      run: cmake -E make_directory ${{github.workspace}}/build
+
+    - name: Configure CMake
+      # Use a bash shell so we can use the same syntax for environment variable
+      # access regardless of the host operating system
+      shell: bash
+      env:
+        CC: gcc-10
+        CXX: g++-10
+      working-directory: ${{github.workspace}}/build
+      # Note the current convention is to use the -S and -B options here to specify source
+      # and build directories, but this is only available with CMake 3.13 and higher.
+      # The CMake binaries on the Github Actions machines are (as of this writing) 3.12
+      run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE
+
+    - name: Build
+      working-directory: ${{github.workspace}}/build
+      shell: bash
+      # Execute the build.  You can specify a specific target with "--target <NAME>"
+      run: cmake --build . --config $BUILD_TYPE --target test
+
+    - name: Test
+      working-directory: ${{github.workspace}}/build/test
+      shell: bash
+      run: |
+        ln -s ../../test/*.png .
+        QT_QPA_PLATFORM=offscreen ./test ~[noci]
-- 
cgit 


From f84952d6ae95e52b40b61a271ab259c4b9df8a9e Mon Sep 17 00:00:00 2001
From: Skye Deving <76892045+skyedeving@users.noreply.github.com>
Date: Sat, 9 Jan 2021 12:06:33 -0600
Subject: Fix the workflow startup error maybe

---
 .github/workflows/build.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to '.github/workflows')

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 82eaad6..a583204 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -73,8 +73,7 @@ jobs:
       run: strip -s Attorney_Online
 
     - name: Upload Artifact
-      working-directory: ${{github.workspace}}/build
       uses: actions/upload-artifact@v2
       with:
         name: Attorney_Online
-        path: Attorney_Online
+        path: ${{github.workspace}}/build/Attorney_Online
-- 
cgit 


From 7055e7dbc06ad23195ad0056ae87b2786d446dc2 Mon Sep 17 00:00:00 2001
From: Skye Deving <76892045+skyedeving@users.noreply.github.com>
Date: Sat, 9 Jan 2021 12:09:08 -0600
Subject: Add the Catch2 install to workflow

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

(limited to '.github/workflows')

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index a583204..471d4b8 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -17,6 +17,14 @@ jobs:
     steps:
     - uses: actions/checkout@v2
 
+    - name: Install catch2
+      run: |
+        curl -L https://github.com/catchorg/Catch2/archive/v2.13.4.tar.gz -o catch2.tar.gz
+        tar xvf catch2.tar.gz
+        cd Catch2-2.13.4
+        cmake -Bbuild -H. -DBUILD_TESTING=OFF
+        sudo cmake --build build/ --target install
+
     - name: Fetch external libs
       run: |
         # Download
-- 
cgit 


From 8b817ac3f680f6a5484becfcf4fe36bc91fe4727 Mon Sep 17 00:00:00 2001
From: Skye Deving <76892045+skyedeving@users.noreply.github.com>
Date: Sat, 9 Jan 2021 12:11:04 -0600
Subject: Add target command lne option

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to '.github/workflows')

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 471d4b8..e0972b6 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -73,7 +73,7 @@ jobs:
       working-directory: ${{github.workspace}}/build
       shell: bash
       # Execute the build.  You can specify a specific target with "--target <NAME>"
-      run: cmake --build . --config $BUILD_TYPE Attorney_Online
+      run: cmake --build . --config $BUILD_TYPE --target Attorney_Online
 
     - name: Strip
       working-directory: ${{github.workspace}}/build
-- 
cgit 


From b9e6918b219c67bf21429305bdf5a49e007d3156 Mon Sep 17 00:00:00 2001
From: Skye Deving <76892045+skyedeving@users.noreply.github.com>
Date: Sat, 9 Jan 2021 12:17:36 -0600
Subject: Build Attorney Online artifact only when push to master

---
 .github/workflows/build.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to '.github/workflows')

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index e0972b6..921b0d0 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1,6 +1,9 @@
 name: build
 
-on: [push]
+on:
+  push:
+    branches:
+      - master
 
 env:
   # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
-- 
cgit 


From daa3e173fa7e1fe5885071f6461db280b387e4e0 Mon Sep 17 00:00:00 2001
From: Skye Deving <76892045+skyedeving@users.noreply.github.com>
Date: Sat, 9 Jan 2021 12:22:46 -0600
Subject: Compress binary

---
 .github/workflows/build.yml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to '.github/workflows')

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 921b0d0..e19e0cf 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -83,8 +83,13 @@ jobs:
       shell: bash
       run: strip -s Attorney_Online
 
+    - name: Compress
+      working-directory: ${{github.workspace}}/build
+      shell: bash
+      run: tar czvf Attorney_Online-linux-x86_64.tgz Attorney_Online
+
     - name: Upload Artifact
       uses: actions/upload-artifact@v2
       with:
         name: Attorney_Online
-        path: ${{github.workspace}}/build/Attorney_Online
+        path: ${{github.workspace}}/build/Attorney_Online-linux-x86_64.tgz
-- 
cgit 


From a921b23eade6b3f1f3bb30c554fe6295e878ed07 Mon Sep 17 00:00:00 2001
From: Skye Deving <76892045+skyedeving@users.noreply.github.com>
Date: Sat, 9 Jan 2021 12:32:08 -0600
Subject: Move env var into the action itself

---
 .github/workflows/test.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to '.github/workflows')

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index dadaa23..6d745e0 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -77,6 +77,8 @@ jobs:
     - name: Test
       working-directory: ${{github.workspace}}/build/test
       shell: bash
+      env:
+        QT_QPA_PLATFORM: offscreen
       run: |
         ln -s ../../test/*.png .
-        QT_QPA_PLATFORM=offscreen ./test ~[noci]
+        ./test ~[noci]
-- 
cgit 


From 9c86ed7ffe742710d68cf9f587d082396e18aa84 Mon Sep 17 00:00:00 2001
From: Skye Deving <76892045+skyedeving@users.noreply.github.com>
Date: Sun, 10 Jan 2021 12:06:50 -0600
Subject: Trigger tests only on this branch for now

---
 .github/workflows/test.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to '.github/workflows')

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 6d745e0..37905ad 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -1,6 +1,9 @@
 name: test
 
-on: [push]
+on:
+  push:
+    branch:
+      - test
 
 env:
   # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
-- 
cgit 


From fef16a320ad9995f9256184777f8d705f09a61d0 Mon Sep 17 00:00:00 2001
From: Skye Deving <76892045+skyedeving@users.noreply.github.com>
Date: Sun, 10 Jan 2021 12:47:56 -0600
Subject: Fix branch name

---
 .github/workflows/test.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to '.github/workflows')

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 37905ad..4350a7c 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -2,8 +2,8 @@ name: test
 
 on:
   push:
-    branch:
-      - test
+    branches:
+      - add-tests
 
 env:
   # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
-- 
cgit 


From 67214b772d92b6750233ceaee4057e4aa32f574e Mon Sep 17 00:00:00 2001
From: Skye Deving <76892045+skyedeving@users.noreply.github.com>
Date: Tue, 26 Jan 2021 19:19:25 -0600
Subject: Attempt windows build

---
 .github/workflows/build.yml | 180 ++++++++++++++++++++++++++------------------
 1 file changed, 106 insertions(+), 74 deletions(-)

(limited to '.github/workflows')

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index e19e0cf..aea8c3e 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -3,93 +3,125 @@ name: build
 on:
   push:
     branches:
-      - master
+      - add-tests
 
 env:
   # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
   BUILD_TYPE: Release
 
 jobs:
-  build:
-    # The CMake configure and build commands are platform agnostic and should work equally
-    # well on Windows or Mac.  You can convert this to a matrix build if you need
-    # cross-platform coverage.
-    # See: https://docs.github.com/en/free-pro-team@latest/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix
-    runs-on: ubuntu-20.04
+  windows:
+    runs-on: windows-latest
 
     steps:
     - uses: actions/checkout@v2
+      
+    - name: actions/cache qt
+      uses: actions/cache@v1
+      id: cache
+      with:
+        path: qt/5.15.2/msvc2019_64
+        key: qt-5.15.2-msvc2019_64
+        
+    - uses: Skycoder42/action-setup-qt@master
+      id: qt
+      with:
+        version: 5.15.2
+        platform: msvc2019_64
+        cachedir: qt/5.15.2/msvc2019_64
 
-    - name: Install catch2
-      run: |
-        curl -L https://github.com/catchorg/Catch2/archive/v2.13.4.tar.gz -o catch2.tar.gz
-        tar xvf catch2.tar.gz
-        cd Catch2-2.13.4
-        cmake -Bbuild -H. -DBUILD_TESTING=OFF
-        sudo cmake --build build/ --target install
-
-    - name: Fetch external libs
-      run: |
-        # Download
-        curl http://www.un4seen.com/files/bass24-linux.zip -o bass_linux.zip
-        curl http://www.un4seen.com/files/bassopus24-linux.zip -o bassopus_linux.zip
-        curl -L https://github.com/discordapp/discord-rpc/releases/download/v3.4.0/discord-rpc-linux.zip -o discord_rpc_linux.zip
-        # Extract
-        unzip bass_linux.zip
-        unzip bassopus_linux.zip
-        unzip discord_rpc_linux.zip
-        # Copy
-        cp x64/libbass.so lib
-        cp x64/libbassopus.so lib
-        cp discord-rpc/linux-dynamic/lib/libdiscord-rpc.so lib
-
-    - name: Install Qt5
-      run: sudo apt update -y && sudo apt install -y qt5-default
-
-    - name: Install QtApng
+    - name: qmake
       run: |
-        git clone https://github.com/Skycoder42/QtApng
-        cd QtApng
-        qmake
-        make
-        sudo make install
-
-    - name: Create Build Environment
-      # Some projects don't allow in-source building, so create a separate build directory
-      # We'll use this as our working directory for all subsequent commands
-      run: cmake -E make_directory ${{github.workspace}}/build
-
-    - name: Configure CMake
-      # Use a bash shell so we can use the same syntax for environment variable
-      # access regardless of the host operating system
-      shell: bash
-      env:
-        CC: gcc-10
-        CXX: g++-10
-      working-directory: ${{github.workspace}}/build
-      # Note the current convention is to use the -S and -B options here to specify source
-      # and build directories, but this is only available with CMake 3.13 and higher.
-      # The CMake binaries on the Github Actions machines are (as of this writing) 3.12
-      run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE
-
-    - name: Build
-      working-directory: ${{github.workspace}}/build
-      shell: bash
-      # Execute the build.  You can specify a specific target with "--target <NAME>"
-      run: cmake --build . --config $BUILD_TYPE --target Attorney_Online
-
-    - name: Strip
-      working-directory: ${{github.workspace}}/build
-      shell: bash
-      run: strip -s Attorney_Online
-
-    - name: Compress
-      working-directory: ${{github.workspace}}/build
-      shell: bash
-      run: tar czvf Attorney_Online-linux-x86_64.tgz Attorney_Online
+        qmake CONFIG+=install_ok QT_PLATFORM=msvc2019_64
+        ${{steps.qt.outputs.make}} qmake_all
 
     - name: Upload Artifact
       uses: actions/upload-artifact@v2
       with:
         name: Attorney_Online
-        path: ${{github.workspace}}/build/Attorney_Online-linux-x86_64.tgz
+        path: ${{github.workspace}}/bin/Attorney_Online
+
+
+  # linux:
+  #   # The CMake configure and build commands are platform agnostic and should work equally
+  #   # well on Windows or Mac.  You can convert this to a matrix build if you need
+  #   # cross-platform coverage.
+  #   # See: https://docs.github.com/en/free-pro-team@latest/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix
+  #   runs-on: ubuntu-20.04
+
+  #   steps:
+  #   - uses: actions/checkout@v2
+
+  #   - name: Install catch2
+  #     run: |
+  #       curl -L https://github.com/catchorg/Catch2/archive/v2.13.4.tar.gz -o catch2.tar.gz
+  #       tar xvf catch2.tar.gz
+  #       cd Catch2-2.13.4
+  #       cmake -Bbuild -H. -DBUILD_TESTING=OFF
+  #       sudo cmake --build build/ --target install
+
+  #   - name: Fetch external libs
+  #     run: |
+  #       # Download
+  #       curl http://www.un4seen.com/files/bass24-linux.zip -o bass_linux.zip
+  #       curl http://www.un4seen.com/files/bassopus24-linux.zip -o bassopus_linux.zip
+  #       curl -L https://github.com/discordapp/discord-rpc/releases/download/v3.4.0/discord-rpc-linux.zip -o discord_rpc_linux.zip
+  #       # Extract
+  #       unzip bass_linux.zip
+  #       unzip bassopus_linux.zip
+  #       unzip discord_rpc_linux.zip
+  #       # Copy
+  #       cp x64/libbass.so lib
+  #       cp x64/libbassopus.so lib
+  #       cp discord-rpc/linux-dynamic/lib/libdiscord-rpc.so lib
+
+  #   - name: Install Qt5
+  #     run: sudo apt update -y && sudo apt install -y qt5-default
+
+  #   - name: Install QtApng
+  #     run: |
+  #       git clone https://github.com/Skycoder42/QtApng
+  #       cd QtApng
+  #       qmake
+  #       make
+  #       sudo make install
+
+  #   - name: Create Build Environment
+  #     # Some projects don't allow in-source building, so create a separate build directory
+  #     # We'll use this as our working directory for all subsequent commands
+  #     run: cmake -E make_directory ${{github.workspace}}/build
+
+  #   - name: Configure CMake
+  #     # Use a bash shell so we can use the same syntax for environment variable
+  #     # access regardless of the host operating system
+  #     shell: bash
+  #     env:
+  #       CC: gcc-10
+  #       CXX: g++-10
+  #     working-directory: ${{github.workspace}}/build
+  #     # Note the current convention is to use the -S and -B options here to specify source
+  #     # and build directories, but this is only available with CMake 3.13 and higher.
+  #     # The CMake binaries on the Github Actions machines are (as of this writing) 3.12
+  #     run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE
+
+  #   - name: Build
+  #     working-directory: ${{github.workspace}}/build
+  #     shell: bash
+  #     # Execute the build.  You can specify a specific target with "--target <NAME>"
+  #     run: cmake --build . --config $BUILD_TYPE --target Attorney_Online
+
+  #   - name: Strip
+  #     working-directory: ${{github.workspace}}/build
+  #     shell: bash
+  #     run: strip -s Attorney_Online
+
+  #   - name: Compress
+  #     working-directory: ${{github.workspace}}/build
+  #     shell: bash
+  #     run: tar czvf Attorney_Online-linux-x86_64.tgz Attorney_Online
+
+  #   - name: Upload Artifact
+  #     uses: actions/upload-artifact@v2
+  #     with:
+  #       name: Attorney_Online
+  #       path: ${{github.workspace}}/build/Attorney_Online-linux-x86_64.tgz
-- 
cgit 


From aef425c112b74be135b7fbe41f13c52117963772 Mon Sep 17 00:00:00 2001
From: Skye Deving <76892045+skyedeving@users.noreply.github.com>
Date: Tue, 26 Jan 2021 19:28:04 -0600
Subject: Downgrade qt version

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

(limited to '.github/workflows')

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index aea8c3e..6dec993 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -20,15 +20,15 @@ jobs:
       uses: actions/cache@v1
       id: cache
       with:
-        path: qt/5.15.2/msvc2019_64
-        key: qt-5.15.2-msvc2019_64
+        path: qt/5.15.0/msvc2019_64
+        key: qt-5.15.0-msvc2019_64
         
     - uses: Skycoder42/action-setup-qt@master
       id: qt
       with:
-        version: 5.15.2
+        version: 5.15.0
         platform: msvc2019_64
-        cachedir: qt/5.15.2/msvc2019_64
+        cachedir: qt/5.15.0/msvc2019_64
 
     - name: qmake
       run: |
@@ -41,7 +41,6 @@ jobs:
         name: Attorney_Online
         path: ${{github.workspace}}/bin/Attorney_Online
 
-
   # linux:
   #   # The CMake configure and build commands are platform agnostic and should work equally
   #   # well on Windows or Mac.  You can convert this to a matrix build if you need
-- 
cgit 


From a63f8e0a5f715cef92749b24d94b8385a703403b Mon Sep 17 00:00:00 2001
From: Skye Deving <76892045+skyedeving@users.noreply.github.com>
Date: Tue, 26 Jan 2021 19:33:33 -0600
Subject: Remove manual cache because it defaults

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

(limited to '.github/workflows')

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 6dec993..ab823f0 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -15,20 +15,12 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-      
-    - name: actions/cache qt
-      uses: actions/cache@v1
-      id: cache
-      with:
-        path: qt/5.15.0/msvc2019_64
-        key: qt-5.15.0-msvc2019_64
         
     - uses: Skycoder42/action-setup-qt@master
       id: qt
       with:
         version: 5.15.0
         platform: msvc2019_64
-        cachedir: qt/5.15.0/msvc2019_64
 
     - name: qmake
       run: |
-- 
cgit 


From d4f24b3109e6f583227c46f08f6a15ad94383f56 Mon Sep 17 00:00:00 2001
From: Skye Deving <76892045+skyedeving@users.noreply.github.com>
Date: Tue, 26 Jan 2021 19:42:21 -0600
Subject: Setup python

---
 .github/workflows/build.yml | 2 ++
 1 file changed, 2 insertions(+)

(limited to '.github/workflows')

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index ab823f0..98c49ec 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -15,6 +15,8 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
+
+    - uses: actions/setup-python@v1
         
     - uses: Skycoder42/action-setup-qt@master
       id: qt
-- 
cgit 


From 672b315272668d6491a7581422192955c692ef50 Mon Sep 17 00:00:00 2001
From: Skye Deving <76892045+skyedeving@users.noreply.github.com>
Date: Tue, 26 Jan 2021 20:04:31 -0600
Subject: Attempt to use different qt installer

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

(limited to '.github/workflows')

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 98c49ec..d4653cd 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -16,18 +16,37 @@ jobs:
     steps:
     - uses: actions/checkout@v2
 
-    - uses: actions/setup-python@v1
-        
-    - uses: Skycoder42/action-setup-qt@master
-      id: qt
+    - name: Cache Qt
+      id: cache-qt
+      uses: actions/cache@v1
       with:
-        version: 5.15.0
-        platform: msvc2019_64
+        path: ${{ github.workspace }}/qt5
+        key: ${{ runner.os }}-qt5
+
+    - name: Install Qt
+      uses: jurplel/install-qt-action@v2
+      with:
+        version: '5.15.2'
+        host: 'windows'
+        target: 'desktop'
+        arch: 'win64_msvc2019_64'
+        dir: '${{ github.workspace }}/qt5/'
+        install-deps: 'true'
+        modules: ''
+        cached: ${{ steps.cache-qt.outputs.cache-hit }}
+        setup-python: 'true'
+        tools: ''
+        set-env: 'false'
+        tools-only: 'false'
+        aqtversion: '==0.11.1'
+        py7zrversion: '==0.11.3'
+        extra: '--external 7z'
 
     - name: qmake
       run: |
-        qmake CONFIG+=install_ok QT_PLATFORM=msvc2019_64
-        ${{steps.qt.outputs.make}} qmake_all
+        Invoke-BatchFile "%programfiles(x86)%\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
+        qmake
+        nmake
 
     - name: Upload Artifact
       uses: actions/upload-artifact@v2
-- 
cgit 


From 51b77403eb5f3b6e883b96d498521607eedc8c17 Mon Sep 17 00:00:00 2001
From: Skye Deving <76892045+skyedeving@users.noreply.github.com>
Date: Tue, 26 Jan 2021 20:09:16 -0600
Subject: Try to invoke the bat file better

---
 .github/workflows/build.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to '.github/workflows')

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index d4653cd..3d6bc88 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -30,7 +30,7 @@ jobs:
         host: 'windows'
         target: 'desktop'
         arch: 'win64_msvc2019_64'
-        dir: '${{ github.workspace }}/qt5/'
+        dir: '${{ github.workspace }}/qt5'
         install-deps: 'true'
         modules: ''
         cached: ${{ steps.cache-qt.outputs.cache-hit }}
@@ -44,7 +44,7 @@ jobs:
 
     - name: qmake
       run: |
-        Invoke-BatchFile "%programfiles(x86)%\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
+        call "%programfiles(x86)%\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
         qmake
         nmake
 
-- 
cgit 


From 0cd3351013c294090759a05856df2901d85aa280 Mon Sep 17 00:00:00 2001
From: Skye Deving <76892045+skyedeving@users.noreply.github.com>
Date: Tue, 26 Jan 2021 20:12:57 -0600
Subject: Change the windows again

---
 .github/workflows/build.yml | 3 +++
 1 file changed, 3 insertions(+)

(limited to '.github/workflows')

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 3d6bc88..bc4e82a 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -43,9 +43,12 @@ jobs:
         extra: '--external 7z'
 
     - name: qmake
+      shell: cmd
       run: |
         call "%programfiles(x86)%\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
+        qmake -v
         qmake
+        set CL=/MP
         nmake
 
     - name: Upload Artifact
-- 
cgit 


From 4429d5e630ff73f8b89555b12035c27d2c859718 Mon Sep 17 00:00:00 2001
From: Skye Deving <76892045+skyedeving@users.noreply.github.com>
Date: Tue, 26 Jan 2021 20:17:17 -0600
Subject: Add new step for compiler

---
 .github/workflows/build.yml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to '.github/workflows')

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index bc4e82a..d4e6c9c 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -42,13 +42,12 @@ jobs:
         py7zrversion: '==0.11.3'
         extra: '--external 7z'
 
+    - name: Install compiler
+      uses: ilammy/msvc-dev-cmd@v1
+
     - name: qmake
-      shell: cmd
       run: |
-        call "%programfiles(x86)%\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
-        qmake -v
         qmake
-        set CL=/MP
         nmake
 
     - name: Upload Artifact
-- 
cgit 


From 6ae4e617b0cbb05921f86282b8e74a184cbaa84a Mon Sep 17 00:00:00 2001
From: Skye Deving <76892045+skyedeving@users.noreply.github.com>
Date: Tue, 26 Jan 2021 20:20:55 -0600
Subject: Attempt to do things again

---
 .github/workflows/build.yml | 18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)

(limited to '.github/workflows')

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index d4e6c9c..dd675d9 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -20,27 +20,15 @@ jobs:
       id: cache-qt
       uses: actions/cache@v1
       with:
-        path: ${{ github.workspace }}/qt5
+        path: ../Qt
         key: ${{ runner.os }}-qt5
 
     - name: Install Qt
       uses: jurplel/install-qt-action@v2
       with:
         version: '5.15.2'
-        host: 'windows'
-        target: 'desktop'
-        arch: 'win64_msvc2019_64'
-        dir: '${{ github.workspace }}/qt5'
-        install-deps: 'true'
-        modules: ''
-        cached: ${{ steps.cache-qt.outputs.cache-hit }}
-        setup-python: 'true'
-        tools: ''
-        set-env: 'false'
-        tools-only: 'false'
-        aqtversion: '==0.11.1'
-        py7zrversion: '==0.11.3'
-        extra: '--external 7z'
+        arch: win64_msvc2019_64
+        cached: ${{steps.cache-qt.outputs.cache-hit}}
 
     - name: Install compiler
       uses: ilammy/msvc-dev-cmd@v1
-- 
cgit 


From afb534bf673332f4e4e16d46ea0971c509dcc8cb Mon Sep 17 00:00:00 2001
From: Skye Deving <76892045+skyedeving@users.noreply.github.com>
Date: Tue, 26 Jan 2021 20:29:57 -0600
Subject: Grab bass dependency

---
 .github/workflows/build.yml | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to '.github/workflows')

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index dd675d9..79006b5 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -16,6 +16,17 @@ jobs:
     steps:
     - uses: actions/checkout@v2
 
+    - name: Grab bass
+      run: |
+        mkdir bass
+        cd bass
+        curl http://www.un4seen.com/files/bass24.zip -o bass.zip
+        unzip bass.zip
+        cp bass.dll ../lib
+        curl http://www.un4seen.com/files/bassopus24.zip -o bassopus.zip
+        unzip bassopus.zip
+        cp bassopus.dll ../lib
+
     - name: Cache Qt
       id: cache-qt
       uses: actions/cache@v1
-- 
cgit 


From 9b36fb8bdaf95baaa3dc2d5b799852384bdb53ad Mon Sep 17 00:00:00 2001
From: Skye Deving <76892045+skyedeving@users.noreply.github.com>
Date: Tue, 26 Jan 2021 20:44:25 -0600
Subject: Maybe using cmake will work

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

(limited to '.github/workflows')

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 79006b5..4c2f0d9 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -16,7 +16,7 @@ jobs:
     steps:
     - uses: actions/checkout@v2
 
-    - name: Grab bass
+    - name: Download BASS
       run: |
         mkdir bass
         cd bass
@@ -44,16 +44,17 @@ jobs:
     - name: Install compiler
       uses: ilammy/msvc-dev-cmd@v1
 
-    - name: qmake
+    - name: cmake
       run: |
-        qmake
-        nmake
+        mkdir build && cd build
+        cmake ..
+        make
 
     - name: Upload Artifact
       uses: actions/upload-artifact@v2
       with:
         name: Attorney_Online
-        path: ${{github.workspace}}/bin/Attorney_Online
+        path: ${{github.workspace}}/build/Attorney_Online
 
   # linux:
   #   # The CMake configure and build commands are platform agnostic and should work equally
-- 
cgit 


From 2e66e802a17741aa701b067a5210b46bf65f40ba Mon Sep 17 00:00:00 2001
From: Skye Deving <76892045+skyedeving@users.noreply.github.com>
Date: Tue, 26 Jan 2021 20:48:43 -0600
Subject: Try using proper cmake steps

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

(limited to '.github/workflows')

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 4c2f0d9..9522024 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -41,14 +41,21 @@ jobs:
         arch: win64_msvc2019_64
         cached: ${{steps.cache-qt.outputs.cache-hit}}
 
-    - name: Install compiler
-      uses: ilammy/msvc-dev-cmd@v1
-
-    - name: cmake
-      run: |
-        mkdir build && cd build
-        cmake ..
-        make
+    - name: Create Build Environment
+      run: cmake -E make_directory ${{github.workspace}}/build
+
+    - name: Configure CMake
+      shell: bash
+      env:
+        CC: gcc-10
+        CXX: g++-10
+      working-directory: ${{github.workspace}}/build
+      run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE
+
+    - name: Build
+      working-directory: ${{github.workspace}}/build
+      shell: bash
+      run: cmake --build . --config $BUILD_TYPE --target Attorney_Online
 
     - name: Upload Artifact
       uses: actions/upload-artifact@v2
-- 
cgit 


From 0a1dc4a234600e71dec963b6a2f040867c693735 Mon Sep 17 00:00:00 2001
From: Skye Deving <76892045+skyedeving@users.noreply.github.com>
Date: Tue, 26 Jan 2021 20:57:12 -0600
Subject: Install Catch2

---
 .github/workflows/build.yml | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to '.github/workflows')

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 9522024..b86b6c2 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -16,6 +16,15 @@ jobs:
     steps:
     - uses: actions/checkout@v2
 
+    - name: Install catch2
+      shell: bash
+      run: |
+        curl -L https://github.com/catchorg/Catch2/archive/v2.13.4.tar.gz -o catch2.tar.gz
+        tar xvf catch2.tar.gz
+        cd Catch2-2.13.4
+        cmake -Bbuild -H. -DBUILD_TESTING=OFF
+        sudo cmake --build build/ --target install
+
     - name: Download BASS
       run: |
         mkdir bass
-- 
cgit 


From f9700bf6eba4681ff447cf3c2182bc21534cbb9d Mon Sep 17 00:00:00 2001
From: Skye Deving <76892045+skyedeving@users.noreply.github.com>
Date: Tue, 26 Jan 2021 20:58:59 -0600
Subject: Remove sudo

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to '.github/workflows')

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index b86b6c2..f7080e8 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -23,7 +23,7 @@ jobs:
         tar xvf catch2.tar.gz
         cd Catch2-2.13.4
         cmake -Bbuild -H. -DBUILD_TESTING=OFF
-        sudo cmake --build build/ --target install
+        cmake --build build/ --target install
 
     - name: Download BASS
       run: |
-- 
cgit 


From 6a2e7e16d0615e195d7db3ae93be04eafc628bc8 Mon Sep 17 00:00:00 2001
From: Skye Deving <76892045+skyedeving@users.noreply.github.com>
Date: Tue, 26 Jan 2021 21:38:52 -0600
Subject: Remove unneeded option

---
 .github/workflows/build.yml | 1 -
 1 file changed, 1 deletion(-)

(limited to '.github/workflows')

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index f7080e8..1a44a7a 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -47,7 +47,6 @@ jobs:
       uses: jurplel/install-qt-action@v2
       with:
         version: '5.15.2'
-        arch: win64_msvc2019_64
         cached: ${{steps.cache-qt.outputs.cache-hit}}
 
     - name: Create Build Environment
-- 
cgit 


From 214e94146426b29c7db5257c55897369f0c2bc32 Mon Sep 17 00:00:00 2001
From: Skye Deving <76892045+skyedeving@users.noreply.github.com>
Date: Wed, 27 Jan 2021 01:57:41 -0600
Subject: Make this just install qt for cache

---
 .github/workflows/build.yml | 42 +++++++++++++++++++++---------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

(limited to '.github/workflows')

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 1a44a7a..60da628 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -49,27 +49,27 @@ jobs:
         version: '5.15.2'
         cached: ${{steps.cache-qt.outputs.cache-hit}}
 
-    - name: Create Build Environment
-      run: cmake -E make_directory ${{github.workspace}}/build
-
-    - name: Configure CMake
-      shell: bash
-      env:
-        CC: gcc-10
-        CXX: g++-10
-      working-directory: ${{github.workspace}}/build
-      run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE
-
-    - name: Build
-      working-directory: ${{github.workspace}}/build
-      shell: bash
-      run: cmake --build . --config $BUILD_TYPE --target Attorney_Online
-
-    - name: Upload Artifact
-      uses: actions/upload-artifact@v2
-      with:
-        name: Attorney_Online
-        path: ${{github.workspace}}/build/Attorney_Online
+    # - name: Create Build Environment
+    #   run: cmake -E make_directory ${{github.workspace}}/build
+
+    # - name: Configure CMake
+    #   shell: bash
+    #   env:
+    #     CC: gcc-10
+    #     CXX: g++-10
+    #   working-directory: ${{github.workspace}}/build
+    #   run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE
+
+    # - name: Build
+    #   working-directory: ${{github.workspace}}/build
+    #   shell: bash
+    #   run: cmake --build . --config $BUILD_TYPE --target Attorney_Online
+
+    # - name: Upload Artifact
+    #   uses: actions/upload-artifact@v2
+    #   with:
+    #     name: Attorney_Online
+    #     path: ${{github.workspace}}/build/Attorney_Online
 
   # linux:
   #   # The CMake configure and build commands are platform agnostic and should work equally
-- 
cgit 


From bb63cfd1781783b26f3083a16c3c7d0ec6b45b2a Mon Sep 17 00:00:00 2001
From: Skye Deving <76892045+skyedeving@users.noreply.github.com>
Date: Wed, 27 Jan 2021 02:04:37 -0600
Subject: Renable build and copy more bass

---
 .github/workflows/build.yml | 46 ++++++++++++++++++++++-----------------------
 1 file changed, 23 insertions(+), 23 deletions(-)

(limited to '.github/workflows')

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 60da628..b301e35 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -31,10 +31,10 @@ jobs:
         cd bass
         curl http://www.un4seen.com/files/bass24.zip -o bass.zip
         unzip bass.zip
-        cp bass.dll ../lib
+        cp bass.dll c/bass.lib ../lib
         curl http://www.un4seen.com/files/bassopus24.zip -o bassopus.zip
         unzip bassopus.zip
-        cp bassopus.dll ../lib
+        cp bassopus.dll c/bassopus.lib ../lib
 
     - name: Cache Qt
       id: cache-qt
@@ -49,27 +49,27 @@ jobs:
         version: '5.15.2'
         cached: ${{steps.cache-qt.outputs.cache-hit}}
 
-    # - name: Create Build Environment
-    #   run: cmake -E make_directory ${{github.workspace}}/build
-
-    # - name: Configure CMake
-    #   shell: bash
-    #   env:
-    #     CC: gcc-10
-    #     CXX: g++-10
-    #   working-directory: ${{github.workspace}}/build
-    #   run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE
-
-    # - name: Build
-    #   working-directory: ${{github.workspace}}/build
-    #   shell: bash
-    #   run: cmake --build . --config $BUILD_TYPE --target Attorney_Online
-
-    # - name: Upload Artifact
-    #   uses: actions/upload-artifact@v2
-    #   with:
-    #     name: Attorney_Online
-    #     path: ${{github.workspace}}/build/Attorney_Online
+    - name: Create Build Environment
+      run: cmake -E make_directory ${{github.workspace}}/build
+
+    - name: Configure CMake
+      shell: bash
+      env:
+        CC: gcc-10
+        CXX: g++-10
+      working-directory: ${{github.workspace}}/build
+      run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE
+
+    - name: Build
+      working-directory: ${{github.workspace}}/build
+      shell: bash
+      run: cmake --build . --config $BUILD_TYPE --target Attorney_Online
+
+    - name: Upload Artifact
+      uses: actions/upload-artifact@v2
+      with:
+        name: Attorney_Online
+        path: ${{github.workspace}}/build/Attorney_Online
 
   # linux:
   #   # The CMake configure and build commands are platform agnostic and should work equally
-- 
cgit 


From 23b1cf470388e66e914af03c7091fde92b351f0a Mon Sep 17 00:00:00 2001
From: Skye Deving <76892045+skyedeving@users.noreply.github.com>
Date: Wed, 27 Jan 2021 02:07:55 -0600
Subject: Change the copy

---
 .github/workflows/build.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to '.github/workflows')

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index b301e35..9b122d0 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -31,10 +31,12 @@ jobs:
         cd bass
         curl http://www.un4seen.com/files/bass24.zip -o bass.zip
         unzip bass.zip
-        cp bass.dll c/bass.lib ../lib
+        cp bass.dll ../lib
+        cp ./c/bass.lib ../lib
         curl http://www.un4seen.com/files/bassopus24.zip -o bassopus.zip
         unzip bassopus.zip
-        cp bassopus.dll c/bassopus.lib ../lib
+        cp bassopus.dll ../lib
+        cp ./c/bassopus.lib ../lib
 
     - name: Cache Qt
       id: cache-qt
-- 
cgit 


From 7a9cb6a00cafa9ca5f12d2f962fde6bb53ab9f5d Mon Sep 17 00:00:00 2001
From: Skye Deving <76892045+skyedeving@users.noreply.github.com>
Date: Wed, 27 Jan 2021 02:18:56 -0600
Subject: Grab discord-rpc too

---
 .github/workflows/build.yml | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to '.github/workflows')

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 9b122d0..60c9023 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -25,17 +25,23 @@ jobs:
         cmake -Bbuild -H. -DBUILD_TESTING=OFF
         cmake --build build/ --target install
 
-    - name: Download BASS
+    - name: Fetch external libs
       run: |
+        # discord-rpc
+        curl -L https://github.com/discordapp/discord-rpc/releases/download/v3.4.0/discord-rpc-win.zip -o discord_rpc_win.zip
+        unzip discord_rpc_linux.zip
+        cp discord-rpc/win64-static/lib/discord-rpc.lib ../lib
+
+        # BASS
         mkdir bass
         cd bass
         curl http://www.un4seen.com/files/bass24.zip -o bass.zip
         unzip bass.zip
-        cp bass.dll ../lib
         cp ./c/bass.lib ../lib
+
+        # BASS Opus
         curl http://www.un4seen.com/files/bassopus24.zip -o bassopus.zip
         unzip bassopus.zip
-        cp bassopus.dll ../lib
         cp ./c/bassopus.lib ../lib
 
     - name: Cache Qt
-- 
cgit 


From ecf472d4a20f634aa0738fbc9800eda0a5ab842b Mon Sep 17 00:00:00 2001
From: Skye Deving <76892045+skyedeving@users.noreply.github.com>
Date: Wed, 27 Jan 2021 02:21:11 -0600
Subject: Fix typo

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to '.github/workflows')

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 60c9023..326a69b 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -29,7 +29,7 @@ jobs:
       run: |
         # discord-rpc
         curl -L https://github.com/discordapp/discord-rpc/releases/download/v3.4.0/discord-rpc-win.zip -o discord_rpc_win.zip
-        unzip discord_rpc_linux.zip
+        unzip discord_rpc_win.zip
         cp discord-rpc/win64-static/lib/discord-rpc.lib ../lib
 
         # BASS
-- 
cgit 


From 0074bd0e708931f52bcaef2fe40583ffbc3f6e8f Mon Sep 17 00:00:00 2001
From: Skye Deving <76892045+skyedeving@users.noreply.github.com>
Date: Wed, 27 Jan 2021 02:25:57 -0600
Subject: Copy the dynamic lib

---
 .github/workflows/build.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to '.github/workflows')

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 326a69b..f85746e 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -16,7 +16,7 @@ jobs:
     steps:
     - uses: actions/checkout@v2
 
-    - name: Install catch2
+    - name: Install Catch2
       shell: bash
       run: |
         curl -L https://github.com/catchorg/Catch2/archive/v2.13.4.tar.gz -o catch2.tar.gz
@@ -30,7 +30,7 @@ jobs:
         # discord-rpc
         curl -L https://github.com/discordapp/discord-rpc/releases/download/v3.4.0/discord-rpc-win.zip -o discord_rpc_win.zip
         unzip discord_rpc_win.zip
-        cp discord-rpc/win64-static/lib/discord-rpc.lib ../lib
+        cp discord-rpc/win64-dynamic/lib/discord-rpc.lib ../lib
 
         # BASS
         mkdir bass
-- 
cgit 


From 46d6b6719b7e2fc30fd49a892ae4f7cec2256fc7 Mon Sep 17 00:00:00 2001
From: Skye Deving <76892045+skyedeving@users.noreply.github.com>
Date: Wed, 27 Jan 2021 02:34:43 -0600
Subject: Try using win32

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to '.github/workflows')

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index f85746e..234d156 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -30,7 +30,7 @@ jobs:
         # discord-rpc
         curl -L https://github.com/discordapp/discord-rpc/releases/download/v3.4.0/discord-rpc-win.zip -o discord_rpc_win.zip
         unzip discord_rpc_win.zip
-        cp discord-rpc/win64-dynamic/lib/discord-rpc.lib ../lib
+        cp discord-rpc/win32-static/lib/discord-rpc.lib ../lib
 
         # BASS
         mkdir bass
-- 
cgit 


From ea9284d18dcac42ba2e6600ce742370d7ebf0940 Mon Sep 17 00:00:00 2001
From: Skye Deving <76892045+skyedeving@users.noreply.github.com>
Date: Wed, 27 Jan 2021 02:41:12 -0600
Subject: Fix paths and remove env

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

(limited to '.github/workflows')

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 234d156..6ce3a47 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -30,19 +30,17 @@ jobs:
         # discord-rpc
         curl -L https://github.com/discordapp/discord-rpc/releases/download/v3.4.0/discord-rpc-win.zip -o discord_rpc_win.zip
         unzip discord_rpc_win.zip
-        cp discord-rpc/win32-static/lib/discord-rpc.lib ../lib
+        cp ./discord-rpc/win64-static/lib/discord-rpc.lib ./lib
 
         # BASS
-        mkdir bass
-        cd bass
         curl http://www.un4seen.com/files/bass24.zip -o bass.zip
         unzip bass.zip
-        cp ./c/bass.lib ../lib
+        cp ./c/bass.lib ./lib
 
         # BASS Opus
         curl http://www.un4seen.com/files/bassopus24.zip -o bassopus.zip
         unzip bassopus.zip
-        cp ./c/bassopus.lib ../lib
+        cp ./c/bassopus.lib ./lib
 
     - name: Cache Qt
       id: cache-qt
@@ -62,9 +60,6 @@ jobs:
 
     - name: Configure CMake
       shell: bash
-      env:
-        CC: gcc-10
-        CXX: g++-10
       working-directory: ${{github.workspace}}/build
       run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE
 
-- 
cgit 


From 8d7d04e2841efc5f06d9f552d9981e9005bd2194 Mon Sep 17 00:00:00 2001
From: Skye Deving <76892045+skyedeving@users.noreply.github.com>
Date: Wed, 27 Jan 2021 02:45:29 -0600
Subject: Copy the dynamic dll over as well

---
 .github/workflows/build.yml | 2 ++
 1 file changed, 2 insertions(+)

(limited to '.github/workflows')

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 6ce3a47..e11e741 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -35,11 +35,13 @@ jobs:
         # BASS
         curl http://www.un4seen.com/files/bass24.zip -o bass.zip
         unzip bass.zip
+        cp bass.dll ./lib
         cp ./c/bass.lib ./lib
 
         # BASS Opus
         curl http://www.un4seen.com/files/bassopus24.zip -o bassopus.zip
         unzip bassopus.zip
+        cp bassopus.dll ./lib
         cp ./c/bassopus.lib ./lib
 
     - name: Cache Qt
-- 
cgit 


From e9a53b1f88411c75fa29f599d7d5551fe8b1ee8a Mon Sep 17 00:00:00 2001
From: Skye Deving <76892045+skyedeving@users.noreply.github.com>
Date: Wed, 27 Jan 2021 02:47:44 -0600
Subject: Copy the bass x64 dll

---
 .github/workflows/build.yml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to '.github/workflows')

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index e11e741..7aed82b 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -35,14 +35,12 @@ jobs:
         # BASS
         curl http://www.un4seen.com/files/bass24.zip -o bass.zip
         unzip bass.zip
-        cp bass.dll ./lib
-        cp ./c/bass.lib ./lib
+        cp ./x64/bass.dll ./lib
 
         # BASS Opus
         curl http://www.un4seen.com/files/bassopus24.zip -o bassopus.zip
         unzip bassopus.zip
-        cp bassopus.dll ./lib
-        cp ./c/bassopus.lib ./lib
+        cp ./x64/bassopus.dll ./lib
 
     - name: Cache Qt
       id: cache-qt
-- 
cgit 


From 3bd57190f05ad15b646a924124520ad0d9ed76d3 Mon Sep 17 00:00:00 2001
From: Skye Deving <76892045+skyedeving@users.noreply.github.com>
Date: Wed, 27 Jan 2021 02:52:59 -0600
Subject: Add lib as well

---
 .github/workflows/build.yml | 2 ++
 1 file changed, 2 insertions(+)

(limited to '.github/workflows')

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 7aed82b..af89449 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -35,11 +35,13 @@ jobs:
         # BASS
         curl http://www.un4seen.com/files/bass24.zip -o bass.zip
         unzip bass.zip
+        cp ./c/bass.lib ./lib
         cp ./x64/bass.dll ./lib
 
         # BASS Opus
         curl http://www.un4seen.com/files/bassopus24.zip -o bassopus.zip
         unzip bassopus.zip
+        cp ./c/bassopus.lib ./lib
         cp ./x64/bassopus.dll ./lib
 
     - name: Cache Qt
-- 
cgit 


From 712a48cbacbc6fab22cba6db79432b9080ab61cc Mon Sep 17 00:00:00 2001
From: Skye Deving <76892045+skyedeving@users.noreply.github.com>
Date: Wed, 27 Jan 2021 02:58:43 -0600
Subject: Use the x64 bass lib

---
 .github/workflows/build.yml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to '.github/workflows')

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index af89449..bfcb995 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -35,14 +35,12 @@ jobs:
         # BASS
         curl http://www.un4seen.com/files/bass24.zip -o bass.zip
         unzip bass.zip
-        cp ./c/bass.lib ./lib
-        cp ./x64/bass.dll ./lib
+        cp ./c/x64/bass.lib ./lib
 
         # BASS Opus
         curl http://www.un4seen.com/files/bassopus24.zip -o bassopus.zip
         unzip bassopus.zip
-        cp ./c/bassopus.lib ./lib
-        cp ./x64/bassopus.dll ./lib
+        cp ./c/x64/bassopus.lib ./lib
 
     - name: Cache Qt
       id: cache-qt
-- 
cgit 


From af6cacf9d0f49579a9d2311db0cf9a2a302f5c62 Mon Sep 17 00:00:00 2001
From: Skye Deving <76892045+skyedeving@users.noreply.github.com>
Date: Wed, 27 Jan 2021 03:02:30 -0600
Subject: Upload the right artifact

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to '.github/workflows')

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index bfcb995..61e6e14 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -72,7 +72,7 @@ jobs:
       uses: actions/upload-artifact@v2
       with:
         name: Attorney_Online
-        path: ${{github.workspace}}/build/Attorney_Online
+        path: ${{github.workspace}}/build/Release/Attorney_Online.exe
 
   # linux:
   #   # The CMake configure and build commands are platform agnostic and should work equally
-- 
cgit 


From 353ed0746444f0b2bfb1f9d853ca479778c37072 Mon Sep 17 00:00:00 2001
From: Skye Deving <76892045+skyedeving@users.noreply.github.com>
Date: Wed, 27 Jan 2021 03:07:16 -0600
Subject: Rename to zip since artifact is a zip

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to '.github/workflows')

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 61e6e14..45b020a 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -71,7 +71,7 @@ jobs:
     - name: Upload Artifact
       uses: actions/upload-artifact@v2
       with:
-        name: Attorney_Online
+        name: Attorney_Online.zip
         path: ${{github.workspace}}/build/Release/Attorney_Online.exe
 
   # linux:
-- 
cgit 


From 4e188747621db75a5cbcbfe9f8187b0dc4a2c74c Mon Sep 17 00:00:00 2001
From: Skye Deving <76892045+skyedeving@users.noreply.github.com>
Date: Wed, 27 Jan 2021 16:56:09 -0600
Subject: Attempt to deploy

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

(limited to '.github/workflows')

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 45b020a..b9ad347 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -68,6 +68,11 @@ jobs:
       shell: bash
       run: cmake --build . --config $BUILD_TYPE --target Attorney_Online
 
+    - name: Deploy
+      working-directory: ${{github.workspace}}/build
+      shell: bash
+      run: windeployqt Attorney_Online && ls build
+
     - name: Upload Artifact
       uses: actions/upload-artifact@v2
       with:
-- 
cgit 


From 196982ffe5d26688c3f49ff4deca5e1dcbcb1f2a Mon Sep 17 00:00:00 2001
From: Skye Deving <76892045+skyedeving@users.noreply.github.com>
Date: Wed, 27 Jan 2021 17:00:09 -0600
Subject: Add in extension

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to '.github/workflows')

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index b9ad347..61091c7 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -71,7 +71,7 @@ jobs:
     - name: Deploy
       working-directory: ${{github.workspace}}/build
       shell: bash
-      run: windeployqt Attorney_Online && ls build
+      run: windeployqt Attorney_Online.exe && ls build
 
     - name: Upload Artifact
       uses: actions/upload-artifact@v2
-- 
cgit 


From e4152f577b784eea30f76d20979279ae62476806 Mon Sep 17 00:00:00 2001
From: Skye Deving <76892045+skyedeving@users.noreply.github.com>
Date: Wed, 27 Jan 2021 17:04:34 -0600
Subject: Fix path

---
 .github/workflows/build.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to '.github/workflows')

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 61091c7..94993bd 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -69,9 +69,9 @@ jobs:
       run: cmake --build . --config $BUILD_TYPE --target Attorney_Online
 
     - name: Deploy
-      working-directory: ${{github.workspace}}/build
+      working-directory: ${{github.workspace}}/build/Release
       shell: bash
-      run: windeployqt Attorney_Online.exe && ls build
+      run: windeployqt . && ls build
 
     - name: Upload Artifact
       uses: actions/upload-artifact@v2
-- 
cgit 


From 232a299612856764df9065a857758e95641def8e Mon Sep 17 00:00:00 2001
From: Skye Deving <76892045+skyedeving@users.noreply.github.com>
Date: Wed, 27 Jan 2021 17:15:46 -0600
Subject: Remove listing directory

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to '.github/workflows')

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 94993bd..6797601 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -71,7 +71,7 @@ jobs:
     - name: Deploy
       working-directory: ${{github.workspace}}/build/Release
       shell: bash
-      run: windeployqt . && ls build
+      run: windeployqt .
 
     - name: Upload Artifact
       uses: actions/upload-artifact@v2
-- 
cgit 


From 1871a43dc83e6fff4b1a7f2d8b2ffc2aeaca3b3e Mon Sep 17 00:00:00 2001
From: Skye Deving <76892045+skyedeving@users.noreply.github.com>
Date: Wed, 27 Jan 2021 17:25:29 -0600
Subject: Upload the release folder

---
 .github/workflows/build.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to '.github/workflows')

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 6797601..6d3d1e1 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -76,8 +76,8 @@ jobs:
     - name: Upload Artifact
       uses: actions/upload-artifact@v2
       with:
-        name: Attorney_Online.zip
-        path: ${{github.workspace}}/build/Release/Attorney_Online.exe
+        name: Attorney_Online-x64.zip
+        path: ${{github.workspace}}/build/Release/
 
   # linux:
   #   # The CMake configure and build commands are platform agnostic and should work equally
-- 
cgit 


From 56f8d1505cc0db3179640321aaf77b9fc715e10e Mon Sep 17 00:00:00 2001
From: Skye Deving <76892045+skyedeving@users.noreply.github.com>
Date: Wed, 27 Jan 2021 17:30:48 -0600
Subject: Remove unnecessary .zip extension to the name

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to '.github/workflows')

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 6d3d1e1..1ed769e 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -76,7 +76,7 @@ jobs:
     - name: Upload Artifact
       uses: actions/upload-artifact@v2
       with:
-        name: Attorney_Online-x64.zip
+        name: Attorney_Online-x64
         path: ${{github.workspace}}/build/Release/
 
   # linux:
-- 
cgit 


From ed91d60332e2809f580771afdefd80eecb6dbf85 Mon Sep 17 00:00:00 2001
From: Skye Deving <76892045+skyedeving@users.noreply.github.com>
Date: Wed, 27 Jan 2021 17:52:36 -0600
Subject: Use dynamic discord-rpc and copy libs to release folder

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

(limited to '.github/workflows')

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 1ed769e..b07b9cc 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -30,7 +30,7 @@ jobs:
         # discord-rpc
         curl -L https://github.com/discordapp/discord-rpc/releases/download/v3.4.0/discord-rpc-win.zip -o discord_rpc_win.zip
         unzip discord_rpc_win.zip
-        cp ./discord-rpc/win64-static/lib/discord-rpc.lib ./lib
+        cp ./discord-rpc/win64-dynamic/lib/discord-rpc.lib ./lib
 
         # BASS
         curl http://www.un4seen.com/files/bass24.zip -o bass.zip
@@ -71,7 +71,11 @@ jobs:
     - name: Deploy
       working-directory: ${{github.workspace}}/build/Release
       shell: bash
-      run: windeployqt .
+      run: |
+        windeployqt .
+        cp ${{github.workspace}}/discord-rpc/win64-dynamic/bin/discord-rpc.dll .
+        cp ${{github.workspace}}/x64/bass.dll .
+        cp ${{github.workspace}}/x64/bassopus.dll .
 
     - name: Upload Artifact
       uses: actions/upload-artifact@v2
-- 
cgit 


From b55082a676fc141c64c18914b7e236a067c3087f Mon Sep 17 00:00:00 2001
From: Skye Deving <76892045+skyedeving@users.noreply.github.com>
Date: Wed, 27 Jan 2021 17:59:25 -0600
Subject: Use the relative paths to be compatible with the bash shell

---
 .github/workflows/build.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to '.github/workflows')

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index b07b9cc..a22f595 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -73,9 +73,9 @@ jobs:
       shell: bash
       run: |
         windeployqt .
-        cp ${{github.workspace}}/discord-rpc/win64-dynamic/bin/discord-rpc.dll .
-        cp ${{github.workspace}}/x64/bass.dll .
-        cp ${{github.workspace}}/x64/bassopus.dll .
+        cp ../../discord-rpc/win64-dynamic/bin/discord-rpc.dll .
+        cp ../../x64/bass.dll .
+        cp ../../x64/bassopus.dll .
 
     - name: Upload Artifact
       uses: actions/upload-artifact@v2
-- 
cgit 


From d4a2282a3e468b22a36b59d6ed16ec1cdddad833 Mon Sep 17 00:00:00 2001
From: Skye Deving <76892045+skyedeving@users.noreply.github.com>
Date: Wed, 27 Jan 2021 18:18:44 -0600
Subject: Get QtApng

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

(limited to '.github/workflows')

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index a22f595..69b1284 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -27,6 +27,10 @@ jobs:
 
     - name: Fetch external libs
       run: |
+        # QtApng
+        curl -L https://github.com/Skycoder42/QtApng/releases/download/1.1.4/qtapng-msvc2017_64-5.14.1.zip -o apng.zip
+        unzip apng.zip
+
         # discord-rpc
         curl -L https://github.com/discordapp/discord-rpc/releases/download/v3.4.0/discord-rpc-win.zip -o discord_rpc_win.zip
         unzip discord_rpc_win.zip
@@ -73,6 +77,7 @@ jobs:
       shell: bash
       run: |
         windeployqt .
+        cp ../../msvc2017_64/plugins/imageformats/qapng.dll ./imageformats/
         cp ../../discord-rpc/win64-dynamic/bin/discord-rpc.dll .
         cp ../../x64/bass.dll .
         cp ../../x64/bassopus.dll .
-- 
cgit 


From 33ba7a3ea0c28e53286ba4fe37c8abf30483ce1c Mon Sep 17 00:00:00 2001
From: Skye Deving <76892045+skyedeving@users.noreply.github.com>
Date: Thu, 28 Jan 2021 10:10:40 -0600
Subject: Disable workflow trigger to make hopefully make it work

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

(limited to '.github/workflows')

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 69b1284..4a03840 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1,9 +1,9 @@
 name: build
 
-on:
-  push:
-    branches:
-      - add-tests
+# on:
+#   push:
+#     branches:
+#       - add-tests
 
 env:
   # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
-- 
cgit 


From 29370b49cb3c9224adf2beb3b5d6197ca33aa365 Mon Sep 17 00:00:00 2001
From: Skye Deving <76892045+skyedeving@users.noreply.github.com>
Date: Thu, 28 Jan 2021 10:11:14 -0600
Subject: Rename push workflow

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

(limited to '.github/workflows')

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 4a03840..69b1284 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1,9 +1,9 @@
 name: build
 
-# on:
-#   push:
-#     branches:
-#       - add-tests
+on:
+  push:
+    branches:
+      - add-tests
 
 env:
   # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
-- 
cgit