From 16ab30576acefc21f15fe5e7a621ec2efc67b47a Mon Sep 17 00:00:00 2001
From: Filip Gawin <filip.gawin@zoho.com>
Date: Fri, 7 Aug 2020 17:34:29 +0200
Subject: Rename files to avoid conflict with revc

---
 .github/workflows/msvc_amd64.yml     | 67 -----------------------------------
 .github/workflows/msvc_x86.yml       | 68 ------------------------------------
 .github/workflows/re3_msvc_amd64.yml | 67 +++++++++++++++++++++++++++++++++++
 .github/workflows/re3_msvc_x86.yml   | 68 ++++++++++++++++++++++++++++++++++++
 4 files changed, 135 insertions(+), 135 deletions(-)
 delete mode 100644 .github/workflows/msvc_amd64.yml
 delete mode 100644 .github/workflows/msvc_x86.yml
 create mode 100644 .github/workflows/re3_msvc_amd64.yml
 create mode 100644 .github/workflows/re3_msvc_x86.yml

(limited to '.github')

diff --git a/.github/workflows/msvc_amd64.yml b/.github/workflows/msvc_amd64.yml
deleted file mode 100644
index 9f8a2803..00000000
--- a/.github/workflows/msvc_amd64.yml
+++ /dev/null
@@ -1,67 +0,0 @@
-name: msvc_amd64
-
-on:
-  pull_request:
-  push:
-  release:
-    types: published
-env:
-  GLEW_VER: "2.1.0"
-  GLFW_VER: "3.3.2"
-  GLEW_BASE: "glew-2.1.0"
-  GLFW_BASE: "glfw-3.3.2.bin.WIN64"
-  GLEW_FILE: "glew-2.1.0-win32.zip"
-  GLFW_FILE: "glfw-3.3.2.bin.WIN64.zip"
-  GLEW_URL: "https://github.com/nigels-com/glew/releases/download/glew-2.1.0/glew-2.1.0-win32.zip"
-  GLFW_URL: "https://github.com/glfw/glfw/releases/download/3.3.2/glfw-3.3.2.bin.WIN64.zip"
-jobs:
-  build:
-    runs-on: windows-2019
-    strategy:
-      matrix:
-        platform: [win-amd64-librw_d3d9-oal, win-amd64-librw_gl3_glfw-oal]
-        buildtype: [Debug, Release]
-    steps:
-    - name: Add msbuild to PATH
-      uses: microsoft/setup-msbuild@v1.0.1
-    - uses: actions/checkout@v2
-      with:
-        submodules: 'true'
-    - if: ${{ matrix.platform }} == "win-amd64-librw_gl3_glfw-mss"
-      name: Download glew
-      uses: carlosperate/download-file-action@v1.0.3
-      with:
-        file-url: ${{env.GLEW_URL}}
-    - if: ${{ matrix.platform }} == "win-amd64-librw_gl3_glfw-mss"
-      name: Download glfw
-      uses: carlosperate/download-file-action@v1.0.3
-      with:
-        file-url: ${{env.GLFW_URL}}
-    - if: ${{ matrix.platform }} == "win-amd64-librw_gl3_glfw-mss"
-      name: Unpack archives
-      run: |
-          7z x ${{env.GLEW_FILE}}
-          7z x ${{env.GLFW_FILE}}
-    - name: Configure build
-      run: |
-        ./premake5 vs2019 --with-librw --glewdir=${{env.GLEW_BASE}} --glfwdir64=${{env.GLFW_BASE}}
-    - name: Build
-      run: |
-        msbuild -m build/re3.sln /property:Configuration=${{matrix.buildtype}} /property:Platform=${{matrix.platform}}
-    - name: Pack artifacts
-      run: |
-        7z a re3_${{matrix.buildtype}}_${{matrix.platform}}.zip ./bin/${{matrix.platform}}/${{matrix.buildtype}}/*
-    - name: Upload artifact to actions
-      uses: actions/upload-artifact@v2
-      with:
-        name: re3_${{matrix.buildtype}}_${{matrix.platform}}
-        path: ./bin/${{matrix.platform}}/${{matrix.buildtype}}
-#    - name: Upload artifact to Bintray
-#      uses: hpcsc/upload-bintray-docker-action@v1
-#      with:
-#        repository: re3
-#        package: ${{matrix.buildtype}}_${{matrix.platform}}
-#        version:  1.0-$(echo ${GITHUB_SHA}
-#        sourcePath: ./bin/${{matrix.platform}}/${{matrix.buildtype}}
-#        username: gtamodding
-#        apiKey: ${{secrets.BINTRAY_API_KEY}}
diff --git a/.github/workflows/msvc_x86.yml b/.github/workflows/msvc_x86.yml
deleted file mode 100644
index cecf7103..00000000
--- a/.github/workflows/msvc_x86.yml
+++ /dev/null
@@ -1,68 +0,0 @@
-name: msvc_x86
-
-on:
-  pull_request:
-  push:
-  release:
-    types: published
-env:
-  GLEW_VER: "2.1.0"
-  GLFW_VER: "3.3.2"
-  GLEW_BASE: "glew-2.1.0"
-  GLFW_BASE: "glfw-3.3.2.bin.WIN32"
-  GLEW_FILE: "glew-2.1.0-win32.zip"
-  GLFW_FILE: "glfw-3.3.2.bin.WIN32.zip"
-  GLEW_URL: "https://github.com/nigels-com/glew/releases/download/glew-2.1.0/glew-2.1.0-win32.zip"
-  GLFW_URL: "https://github.com/glfw/glfw/releases/download/3.3.2/glfw-3.3.2.bin.WIN32.zip"
-jobs:
-  build:
-    runs-on: windows-2019
-    strategy:
-      matrix:
-        platform: [win-x86-librw_d3d9-mss, win-x86-librw_gl3_glfw-mss, win-x86-librw_d3d9-oal, win-x86-librw_gl3_glfw-oal]
-        buildtype: [Debug, Release]
-    steps:
-    - name: Add msbuild to PATH
-      uses: microsoft/setup-msbuild@v1.0.1
-    - uses: actions/checkout@v2
-      with:
-        submodules: 'true'
-    - if: ${{ matrix.platform }} == "win-x86-librw_gl3_glfw-mss"
-      name: Download glew
-      uses: carlosperate/download-file-action@v1.0.3
-      with:
-        file-url: ${{env.GLEW_URL}}
-    - if: ${{ matrix.platform }} == "win-x86-librw_gl3_glfw-mss"
-      name: Download glfw
-      uses: carlosperate/download-file-action@v1.0.3
-      with:
-        file-url: ${{env.GLFW_URL}}
-    - if: ${{ matrix.platform }} == "win-x86-librw_gl3_glfw-mss"
-      name: Unpack archives
-      run: |
-          7z x ${{env.GLEW_FILE}}
-          7z x ${{env.GLFW_FILE}}
-    - name: Configure build
-      run: |
-        ./premake5 vs2019 --with-librw --glewdir=${{env.GLEW_BASE}} --glfwdir32=${{env.GLFW_BASE}}
-    - name: Build
-      run: |
-        msbuild -m build/re3.sln /property:Configuration=${{matrix.buildtype}} /property:Platform=${{matrix.platform}}
-    - name: Pack artifacts
-      run: |
-        7z a re3_${{matrix.buildtype}}_${{matrix.platform}}.zip ./bin/${{matrix.platform}}/${{matrix.buildtype}}/*
-    - name: Upload artifact to actions
-      uses: actions/upload-artifact@v2
-      with:
-        name: re3_${{matrix.buildtype}}_${{matrix.platform}}
-        path: re3_${{matrix.buildtype}}_${{matrix.platform}}.zip
-#    - name: Upload artifact to Bintray
-#      uses: hpcsc/upload-bintray-docker-action@v1
-#      with:
-#        repository: re3
-#        package: ${{matrix.buildtype}}_${{matrix.platform}}
-#        version:  1.0-$(echo ${GITHUB_SHA}
-#        sourcePath: ./bin/${{matrix.platform}}/${{matrix.buildtype}}
-#        username: gtamodding
-#        apiKey: ${{secrets.BINTRAY_API_KEY}}
-
diff --git a/.github/workflows/re3_msvc_amd64.yml b/.github/workflows/re3_msvc_amd64.yml
new file mode 100644
index 00000000..07b793ba
--- /dev/null
+++ b/.github/workflows/re3_msvc_amd64.yml
@@ -0,0 +1,67 @@
+name: re3_msvc_amd64
+
+on:
+  pull_request:
+  push:
+  release:
+    types: published
+env:
+  GLEW_VER: "2.1.0"
+  GLFW_VER: "3.3.2"
+  GLEW_BASE: "glew-2.1.0"
+  GLFW_BASE: "glfw-3.3.2.bin.WIN64"
+  GLEW_FILE: "glew-2.1.0-win32.zip"
+  GLFW_FILE: "glfw-3.3.2.bin.WIN64.zip"
+  GLEW_URL: "https://github.com/nigels-com/glew/releases/download/glew-2.1.0/glew-2.1.0-win32.zip"
+  GLFW_URL: "https://github.com/glfw/glfw/releases/download/3.3.2/glfw-3.3.2.bin.WIN64.zip"
+jobs:
+  build:
+    runs-on: windows-2019
+    strategy:
+      matrix:
+        platform: [win-amd64-librw_d3d9-oal, win-amd64-librw_gl3_glfw-oal]
+        buildtype: [Debug, Release]
+    steps:
+    - name: Add msbuild to PATH
+      uses: microsoft/setup-msbuild@v1.0.1
+    - uses: actions/checkout@v2
+      with:
+        submodules: 'true'
+    - if: ${{ matrix.platform }} == "win-amd64-librw_gl3_glfw-mss"
+      name: Download glew
+      uses: carlosperate/download-file-action@v1.0.3
+      with:
+        file-url: ${{env.GLEW_URL}}
+    - if: ${{ matrix.platform }} == "win-amd64-librw_gl3_glfw-mss"
+      name: Download glfw
+      uses: carlosperate/download-file-action@v1.0.3
+      with:
+        file-url: ${{env.GLFW_URL}}
+    - if: ${{ matrix.platform }} == "win-amd64-librw_gl3_glfw-mss"
+      name: Unpack archives
+      run: |
+          7z x ${{env.GLEW_FILE}}
+          7z x ${{env.GLFW_FILE}}
+    - name: Configure build
+      run: |
+        ./premake5 vs2019 --with-librw --glewdir=${{env.GLEW_BASE}} --glfwdir64=${{env.GLFW_BASE}}
+    - name: Build
+      run: |
+        msbuild -m build/re3.sln /property:Configuration=${{matrix.buildtype}} /property:Platform=${{matrix.platform}}
+    - name: Pack artifacts
+      run: |
+        7z a re3_${{matrix.buildtype}}_${{matrix.platform}}.zip ./bin/${{matrix.platform}}/${{matrix.buildtype}}/*
+    - name: Upload artifact to actions
+      uses: actions/upload-artifact@v2
+      with:
+        name: re3_${{matrix.buildtype}}_${{matrix.platform}}
+        path: ./bin/${{matrix.platform}}/${{matrix.buildtype}}
+#    - name: Upload artifact to Bintray
+#      uses: hpcsc/upload-bintray-docker-action@v1
+#      with:
+#        repository: re3
+#        package: ${{matrix.buildtype}}_${{matrix.platform}}
+#        version:  1.0-$(echo ${GITHUB_SHA}
+#        sourcePath: ./bin/${{matrix.platform}}/${{matrix.buildtype}}
+#        username: gtamodding
+#        apiKey: ${{secrets.BINTRAY_API_KEY}}
diff --git a/.github/workflows/re3_msvc_x86.yml b/.github/workflows/re3_msvc_x86.yml
new file mode 100644
index 00000000..34e892cf
--- /dev/null
+++ b/.github/workflows/re3_msvc_x86.yml
@@ -0,0 +1,68 @@
+name: re3_msvc_x86
+
+on:
+  pull_request:
+  push:
+  release:
+    types: published
+env:
+  GLEW_VER: "2.1.0"
+  GLFW_VER: "3.3.2"
+  GLEW_BASE: "glew-2.1.0"
+  GLFW_BASE: "glfw-3.3.2.bin.WIN32"
+  GLEW_FILE: "glew-2.1.0-win32.zip"
+  GLFW_FILE: "glfw-3.3.2.bin.WIN32.zip"
+  GLEW_URL: "https://github.com/nigels-com/glew/releases/download/glew-2.1.0/glew-2.1.0-win32.zip"
+  GLFW_URL: "https://github.com/glfw/glfw/releases/download/3.3.2/glfw-3.3.2.bin.WIN32.zip"
+jobs:
+  build:
+    runs-on: windows-2019
+    strategy:
+      matrix:
+        platform: [win-x86-librw_d3d9-mss, win-x86-librw_gl3_glfw-mss, win-x86-librw_d3d9-oal, win-x86-librw_gl3_glfw-oal]
+        buildtype: [Debug, Release]
+    steps:
+    - name: Add msbuild to PATH
+      uses: microsoft/setup-msbuild@v1.0.1
+    - uses: actions/checkout@v2
+      with:
+        submodules: 'true'
+    - if: ${{ matrix.platform }} == "win-x86-librw_gl3_glfw-mss"
+      name: Download glew
+      uses: carlosperate/download-file-action@v1.0.3
+      with:
+        file-url: ${{env.GLEW_URL}}
+    - if: ${{ matrix.platform }} == "win-x86-librw_gl3_glfw-mss"
+      name: Download glfw
+      uses: carlosperate/download-file-action@v1.0.3
+      with:
+        file-url: ${{env.GLFW_URL}}
+    - if: ${{ matrix.platform }} == "win-x86-librw_gl3_glfw-mss"
+      name: Unpack archives
+      run: |
+          7z x ${{env.GLEW_FILE}}
+          7z x ${{env.GLFW_FILE}}
+    - name: Configure build
+      run: |
+        ./premake5 vs2019 --with-librw --glewdir=${{env.GLEW_BASE}} --glfwdir32=${{env.GLFW_BASE}}
+    - name: Build
+      run: |
+        msbuild -m build/re3.sln /property:Configuration=${{matrix.buildtype}} /property:Platform=${{matrix.platform}}
+    - name: Pack artifacts
+      run: |
+        7z a re3_${{matrix.buildtype}}_${{matrix.platform}}.zip ./bin/${{matrix.platform}}/${{matrix.buildtype}}/*
+    - name: Upload artifact to actions
+      uses: actions/upload-artifact@v2
+      with:
+        name: re3_${{matrix.buildtype}}_${{matrix.platform}}
+        path: re3_${{matrix.buildtype}}_${{matrix.platform}}.zip
+#    - name: Upload artifact to Bintray
+#      uses: hpcsc/upload-bintray-docker-action@v1
+#      with:
+#        repository: re3
+#        package: ${{matrix.buildtype}}_${{matrix.platform}}
+#        version:  1.0-$(echo ${GITHUB_SHA}
+#        sourcePath: ./bin/${{matrix.platform}}/${{matrix.buildtype}}
+#        username: gtamodding
+#        apiKey: ${{secrets.BINTRAY_API_KEY}}
+
-- 
cgit v1.2.3