Skip to content

Commit

Permalink
Update ci.yml
Browse files Browse the repository at this point in the history
  • Loading branch information
Margen67 authored Jun 2, 2023
1 parent db23717 commit 24ad9cc
Showing 1 changed file with 56 additions and 55 deletions.
111 changes: 56 additions & 55 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,19 +11,19 @@ on:
# pull_request:

jobs:
build-windows-docker:
runs-on: ubuntu-latest #windows-latest
#strategy:
# fail-fast: false
#container: mgba/windows:w64
env:
POWERSHELL_TELEMETRY_OPTOUT: 1
steps:
- uses: actions/checkout@v3
- run: mkdir -p build-win64
- name: Docker
run: sudo docker run --rm -v ${PWD}:/home/mgba/src mgba/windows:w64
- run: ls
# build-windows-docker:
# runs-on: ubuntu-latest #windows-latest
# #strategy:
# # fail-fast: false
# #container: mgba/windows:w64
# env:
# POWERSHELL_TELEMETRY_OPTOUT: 1
# steps:
# - uses: actions/checkout@v3
# - run: mkdir -p build-win64
# - name: Docker
# run: sudo docker run --rm -v ${PWD}:/home/mgba/src mgba/windows:w64
# - run: ls

# build-windows-msys2:
# runs-on: windows-latest
Expand Down Expand Up @@ -57,32 +57,33 @@ jobs:
# path: build\${{ steps.artifact.outputs.name }}
# if-no-files-found: error

# build-windows-vcpkg:
# runs-on: windows-latest #2019
# strategy:
# #fail-fast: false
# matrix:
# configuration: [Release] #, Debug
# env:
# POWERSHELL_TELEMETRY_OPTOUT: 1
# VCPKG_BUILD_TYPE: ${{ matrix.configuration }}
# VCPKG_DEFAULT_TRIPLET: x64-windows-release
# VCPKG_DISABLE_METRICS: 1
# VCPKG_TARGET_ARCHITECTURE: x64
# steps:
# - uses: actions/checkout@v3
# - name: Setup
# run: |
# vcpkg install ffmpeg[vpx,x264] libepoxy libpng libzip lua sdl2 sqlite3
# vcpkg --no-dry-run upgrade
# - uses: jurplel/[email protected]
# with:
# cache: true
# #setup-python: false
# - name: CMake
# run: cmake -Bbuild -DCMAKE_CONFIGURATION_TYPES=$env:VCPKG_BUILD_TYPE -DZLIB_LIBRARY=zlib
# - name: Build
# run: cmake --build build -j$env:NUMBER_OF_PROCESSORS
build-windows-vcpkg:
runs-on: windows-2019 #latest
strategy:
#fail-fast: false
matrix:
configuration: [Release] #, Debug
env:
POWERSHELL_TELEMETRY_OPTOUT: 1
VCPKG_BUILD_TYPE: ${{ matrix.configuration }}
VCPKG_DEFAULT_TRIPLET: x64-windows-release
VCPKG_DISABLE_METRICS: 1
#VCPKG_TARGET_ARCHITECTURE: x64
steps:
- uses: actions/checkout@v3
- name: Setup
run: |
${env:VCPKG_INSTALLATION_ROOT}\bootstrap-vcpkg.bat
vcpkg install ffmpeg[vpx,x264] libepoxy libpng libzip lua sdl2 sqlite3
vcpkg --no-dry-run upgrade
- uses: jurplel/[email protected]
with:
cache: true
#setup-python: false
- name: CMake
run: cmake -Bbuild -DCMAKE_CONFIGURATION_TYPES=$env:VCPKG_BUILD_TYPE #-DZLIB_LIBRARY=zlib
- name: Build
run: cmake --build build -j$env:NUMBER_OF_PROCESSORS

# build-windows-cross:
# runs-on: ubuntu-latest
Expand Down Expand Up @@ -117,19 +118,19 @@ jobs:
# path: build/*.zip
# if-no-files-found: error

build-linux:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Setup
run: |
sudo apt-get -y update
sudo apt-get -y install libsdl2-dev
- uses: jurplel/[email protected]
with:
cache: true
setup-python: false
- name: CMake
run: cmake -Bbuild
- name: Build
run: cmake --build build -j$(nproc)
# build-linux:
# runs-on: ubuntu-latest
# steps:
# - uses: actions/checkout@v3
# - name: Setup
# run: |
# sudo apt-get -y update
# sudo apt-get -y install libsdl2-dev
# - uses: jurplel/[email protected]
# with:
# cache: true
# setup-python: false
# - name: CMake
# run: cmake -Bbuild
# - name: Build
# run: cmake --build build -j$(nproc)

0 comments on commit 24ad9cc

Please sign in to comment.