fix premake workflows

This commit is contained in:
withmorten 2021-02-17 13:40:42 +01:00
parent 0810abd294
commit f603f4397d
2 changed files with 2 additions and 22 deletions

View file

@ -6,13 +6,9 @@ on:
release: release:
types: published types: published
env: env:
GLEW_VER: "2.1.0"
GLFW_VER: "3.3.2" GLFW_VER: "3.3.2"
GLEW_BASE: "glew-2.1.0"
GLFW_BASE: "glfw-3.3.2.bin.WIN64" 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" 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" GLFW_URL: "https://github.com/glfw/glfw/releases/download/3.3.2/glfw-3.3.2.bin.WIN64.zip"
jobs: jobs:
build: build:
@ -27,11 +23,6 @@ jobs:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
with: with:
submodules: 'true' 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" - if: ${{ matrix.platform }} == "win-amd64-librw_gl3_glfw-mss"
name: Download glfw name: Download glfw
uses: carlosperate/download-file-action@v1.0.3 uses: carlosperate/download-file-action@v1.0.3
@ -40,11 +31,10 @@ jobs:
- if: ${{ matrix.platform }} == "win-amd64-librw_gl3_glfw-mss" - if: ${{ matrix.platform }} == "win-amd64-librw_gl3_glfw-mss"
name: Unpack archives name: Unpack archives
run: | run: |
7z x ${{env.GLEW_FILE}}
7z x ${{env.GLFW_FILE}} 7z x ${{env.GLFW_FILE}}
- name: Configure build - name: Configure build
run: | run: |
./premake5 vs2019 --with-librw --glewdir=${{env.GLEW_BASE}} --glfwdir64=${{env.GLFW_BASE}} ./premake5 vs2019 --with-librw --glfwdir64=${{env.GLFW_BASE}}
- name: Build - name: Build
run: | run: |
msbuild -m build/reVC.sln /property:Configuration=${{matrix.buildtype}} /property:Platform=${{matrix.platform}} msbuild -m build/reVC.sln /property:Configuration=${{matrix.buildtype}} /property:Platform=${{matrix.platform}}

View file

@ -6,13 +6,9 @@ on:
release: release:
types: published types: published
env: env:
GLEW_VER: "2.1.0"
GLFW_VER: "3.3.2" GLFW_VER: "3.3.2"
GLEW_BASE: "glew-2.1.0"
GLFW_BASE: "glfw-3.3.2.bin.WIN32" 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" 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" GLFW_URL: "https://github.com/glfw/glfw/releases/download/3.3.2/glfw-3.3.2.bin.WIN32.zip"
jobs: jobs:
build: build:
@ -27,11 +23,6 @@ jobs:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
with: with:
submodules: 'true' 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" - if: ${{ matrix.platform }} == "win-x86-librw_gl3_glfw-mss"
name: Download glfw name: Download glfw
uses: carlosperate/download-file-action@v1.0.3 uses: carlosperate/download-file-action@v1.0.3
@ -40,11 +31,10 @@ jobs:
- if: ${{ matrix.platform }} == "win-x86-librw_gl3_glfw-mss" - if: ${{ matrix.platform }} == "win-x86-librw_gl3_glfw-mss"
name: Unpack archives name: Unpack archives
run: | run: |
7z x ${{env.GLEW_FILE}}
7z x ${{env.GLFW_FILE}} 7z x ${{env.GLFW_FILE}}
- name: Configure build - name: Configure build
run: | run: |
./premake5 vs2019 --with-librw --glewdir=${{env.GLEW_BASE}} --glfwdir32=${{env.GLFW_BASE}} ./premake5 vs2019 --with-librw --glfwdir32=${{env.GLFW_BASE}}
- name: Build - name: Build
run: | run: |
msbuild -m build/reVC.sln /property:Configuration=${{matrix.buildtype}} /property:Platform=${{matrix.platform}} msbuild -m build/reVC.sln /property:Configuration=${{matrix.buildtype}} /property:Platform=${{matrix.platform}}