diff options
Diffstat (limited to '.github/workflows')
-rw-r--r-- | .github/workflows/build-cmake-conan.yml | 10 | ||||
-rw-r--r-- | .github/workflows/build-switch.yml | 7 | ||||
-rw-r--r-- | .github/workflows/reVC_msvc_amd64.yml (renamed from .github/workflows/re3_msvc_amd64.yml) | 14 | ||||
-rw-r--r-- | .github/workflows/reVC_msvc_x86.yml (renamed from .github/workflows/re3_msvc_x86.yml) | 14 |
4 files changed, 23 insertions, 22 deletions
diff --git a/.github/workflows/build-cmake-conan.yml b/.github/workflows/build-cmake-conan.yml index 5e8dad94..e5e80791 100644 --- a/.github/workflows/build-cmake-conan.yml +++ b/.github/workflows/build-cmake-conan.yml @@ -1,4 +1,4 @@ -name: re3 conan+cmake +name: reVC conan+cmake on: pull_request: push: @@ -96,13 +96,13 @@ jobs: conan export re3mss miles-sdk/master@ - name: "Download/build dependencies (conan install)" run: | - conan install ${{ github.workspace }} re3/master@ -if build -o re3:audio=${{ matrix.audio }} -o librw:platform=${{ matrix.platform }} -o librw:gl3_gfxlib=${{ matrix.gl3_gfxlib || 'glfw' }} --build missing -pr:h ./host_profile -pr:b default -s re3:build_type=RelWithDebInfo -s librw:build_type=RelWithDebInfo + conan install ${{ github.workspace }} reVC/master@ -if build -o reVC:audio=${{ matrix.audio }} -o librw:platform=${{ matrix.platform }} -o librw:gl3_gfxlib=${{ matrix.gl3_gfxlib || 'glfw' }} --build missing -pr:h ./host_profile -pr:b default -s reVC:build_type=RelWithDebInfo -s librw:build_type=RelWithDebInfo env: CONAN_SYSREQUIRES_MODE: enabled - - name: "Build re3 (conan build)" + - name: "Build reVC (conan build)" run: | conan build ${{ github.workspace }} -if build -bf build -pf package - - name: "Package re3 (conan package)" + - name: "Package reVC (conan package)" run: | conan package ${{ github.workspace }} -if build -bf build -pf package - name: "Create binary package (cpack)" @@ -113,5 +113,5 @@ jobs: uses: actions/upload-artifact@v2 with: name: "${{ matrix.os }}-${{ matrix.platform }}" - path: build/*.zip + path: build/*.tar.xz if-no-files-found: error diff --git a/.github/workflows/build-switch.yml b/.github/workflows/build-switch.yml index 46e1d501..c0cdcab0 100644 --- a/.github/workflows/build-switch.yml +++ b/.github/workflows/build-switch.yml @@ -1,4 +1,5 @@ -name: re3 cmake devkitA64 (Nintendo Switch) + +name: reVC cmake devkitA64 (Nintendo Switch) on: pull_request: push: @@ -14,7 +15,7 @@ jobs: submodules: 'true' - name: "Build files" run: | - /opt/devkitpro/portlibs/switch/bin/aarch64-none-elf-cmake -S. -Bbuild -DRE3_AUDIO=OAL -DLIBRW_PLATFORM=GL3 -DLIBRW_GL3_GFXLIB=GLFW -DRE3_WITH_OPUS=False -DRE3_VENDORED_LIBRW=True -DRE3_INSTALL=True + /opt/devkitpro/portlibs/switch/bin/aarch64-none-elf-cmake -S. -Bbuild -DREVC_AUDIO=OAL -DLIBRW_PLATFORM=GL3 -DLIBRW_GL3_GFXLIB=GLFW -DREVC_WITH_OPUS=False -DREVC_VENDORED_LIBRW=True -DREVC_INSTALL=True cmake --build build --parallel - name: "Create binary package (cpack)" working-directory: ./build @@ -24,5 +25,5 @@ jobs: uses: actions/upload-artifact@v2 with: name: "switch-gl3" - path: build/*.zip + path: build/*.tar.xz if-no-files-found: error diff --git a/.github/workflows/re3_msvc_amd64.yml b/.github/workflows/reVC_msvc_amd64.yml index 014ac4f7..a00c5d2c 100644 --- a/.github/workflows/re3_msvc_amd64.yml +++ b/.github/workflows/reVC_msvc_amd64.yml @@ -1,4 +1,4 @@ -name: re3 premake amd64 +name: reVC premake amd64 on: pull_request: @@ -37,14 +37,14 @@ jobs: ./premake5 vs2019 --with-librw --no-full-paths --glfwdir64=${{env.GLFW_BASE}} - name: Build run: | - msbuild -m build/re3.sln /property:Configuration=${{matrix.buildtype}} /property:Platform=${{matrix.platform}} + msbuild -m build/reVC.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}}/* + # 7z a reVC_${{matrix.buildtype}}_${{matrix.platform}}.zip ./bin/${{matrix.platform}}/${{matrix.buildtype}}/* - name: Move binaries to gamefiles run: | - mv ./bin/${{matrix.platform}}/${{matrix.buildtype}}/re3.exe ./gamefiles/ - mv ./bin/${{matrix.platform}}/${{matrix.buildtype}}/re3.pdb ./gamefiles/ + mv ./bin/${{matrix.platform}}/${{matrix.buildtype}}/reVC.exe ./gamefiles/ + mv ./bin/${{matrix.platform}}/${{matrix.buildtype}}/reVC.pdb ./gamefiles/ - name: Move dynamic dependencies to gamefiles run: | mv ./vendor/mpg123/dist/Win64/libmpg123-0.dll ./gamefiles/ @@ -52,12 +52,12 @@ jobs: - name: Upload artifact to actions uses: actions/upload-artifact@v2 with: - name: re3_${{matrix.buildtype}}_${{matrix.platform}} + name: reVC_${{matrix.buildtype}}_${{matrix.platform}} path: ./gamefiles/* # - name: Upload artifact to Bintray # uses: hpcsc/upload-bintray-docker-action@v1 # with: -# repository: re3 +# repository: reVC # package: ${{matrix.buildtype}}_${{matrix.platform}} # version: 1.0-$(echo ${GITHUB_SHA} # sourcePath: ./bin/${{matrix.platform}}/${{matrix.buildtype}} diff --git a/.github/workflows/re3_msvc_x86.yml b/.github/workflows/reVC_msvc_x86.yml index 87f0e430..1407aeae 100644 --- a/.github/workflows/re3_msvc_x86.yml +++ b/.github/workflows/reVC_msvc_x86.yml @@ -1,4 +1,4 @@ -name: re3 premake x86 +name: reVC premake x86 on: pull_request: @@ -37,14 +37,14 @@ jobs: ./premake5 vs2019 --with-librw --no-full-paths --glfwdir32=${{env.GLFW_BASE}} - name: Build run: | - msbuild -m build/re3.sln /property:Configuration=${{matrix.buildtype}} /property:Platform=${{matrix.platform}} + msbuild -m build/reVC.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}}/* + # 7z a reVC_${{matrix.buildtype}}_${{matrix.platform}}.zip ./bin/${{matrix.platform}}/${{matrix.buildtype}}/* - name: Move binaries to gamefiles run: | - mv ./bin/${{matrix.platform}}/${{matrix.buildtype}}/re3.exe ./gamefiles/ - mv ./bin/${{matrix.platform}}/${{matrix.buildtype}}/re3.pdb ./gamefiles/ + mv ./bin/${{matrix.platform}}/${{matrix.buildtype}}/reVC.exe ./gamefiles/ + mv ./bin/${{matrix.platform}}/${{matrix.buildtype}}/reVC.pdb ./gamefiles/ - if: contains(matrix.platform, 'oal') name: Move dynamic dependencies to gamefiles run: | @@ -53,12 +53,12 @@ jobs: - name: Upload artifact to actions uses: actions/upload-artifact@v2 with: - name: re3_${{matrix.buildtype}}_${{matrix.platform}} + name: reVC_${{matrix.buildtype}}_${{matrix.platform}} path: ./gamefiles/* # - name: Upload artifact to Bintray # uses: hpcsc/upload-bintray-docker-action@v1 # with: -# repository: re3 +# repository: reVC # package: ${{matrix.buildtype}}_${{matrix.platform}} # version: 1.0-$(echo ${GITHUB_SHA} # sourcePath: ./bin/${{matrix.platform}}/${{matrix.buildtype}} |