rishi/scryer-prolog
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2048 from infogulch/master

Browse Source 
Build windows with msvc #1998; add ubuntu 22.04 target #2047
This commit is contained in:
Mark Thom
2023-09-27 10:43:54 -06:00
committed by GitHub
parent a6535c28ea 93f46a4142
commit 841aaa78b4
1 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
.github/workflows/ci.yml vendored
View File

@@ -17,20 +17,20 @@ jobs:
fail-fast: false fail-fast: false
matrix: matrix:
include: include:
- { os: windows-latest, rust-version: stable, shell: 'msys2 {0}', target: 'x86_64-pc-windows-gnu'} - { os: windows-latest, rust-version: stable, target: 'x86_64-pc-windows-msvc'}
- { os: macos-11, rust-version: stable, shell: bash, target: 'x86_64-apple-darwin' } - { os: macos-11, rust-version: stable, target: 'x86_64-apple-darwin' }
- { os: ubuntu-20.04, rust-version: stable, shell: bash, extra: true, target: 'x86_64-unknown-linux-gnu' } - { os: ubuntu-22.04, rust-version: stable, target: 'x86_64-unknown-linux-gnu' }
- { os: ubuntu-20.04, rust-version: stable, shell: bash, target: 'i686-unknown-linux-gnu' } - { os: ubuntu-20.04, rust-version: stable, target: 'x86_64-unknown-linux-gnu', extra: true }
- { os: ubuntu-20.04, rust-version: "1.70", shell: bash, target: 'x86_64-unknown-linux-gnu'} - { os: ubuntu-20.04, rust-version: stable, target: 'i686-unknown-linux-gnu' }
- { os: ubuntu-20.04, rust-version: beta, shell: bash, target: 'x86_64-unknown-linux-gnu'} - { os: ubuntu-20.04, rust-version: "1.70", target: 'x86_64-unknown-linux-gnu'}
- { os: ubuntu-20.04, rust-version: nightly, shell: bash, target: 'x86_64-unknown-linux-gnu'} - { os: ubuntu-20.04, rust-version: beta, target: 'x86_64-unknown-linux-gnu'}
- { os: ubuntu-20.04, rust-version: nightly, target: 'x86_64-unknown-linux-gnu'}
defaults: defaults:
run: run:
shell: ${{ matrix.shell }} shell: bash
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- uses: dtolnay/rust-toolchain@master - uses: dtolnay/rust-toolchain@master
if: "!contains(matrix.os,'windows')"
id: toolchain id: toolchain
with: with:
toolchain: ${{ matrix.rust-version }} toolchain: ${{ matrix.rust-version }}
@@ -38,14 +38,12 @@ jobs:
components: clippy, rustfmt components: clippy, rustfmt
- name: Install i686 dependencies - name: Install i686 dependencies
if: "contains(matrix.target,'i686')" if: "contains(matrix.target,'i686')"
run: sudo dpkg --add-architecture i386 && sudo apt-get update && sudo apt-get install libssl-dev:i386 gcc-multilib clang -y && echo "CC=clang" >> $GITHUB_ENV && echo "PKG_CONFIG_SYSROOT_DIR=/" >> $GITHUB_ENV run: |
- uses: msys2/setup-msys2@v2 sudo dpkg --add-architecture i386
if: contains(matrix.os,'windows') sudo apt-get update
with: sudo apt-get install libssl-dev:i386 gcc-multilib clang -y
update: true echo "CC=clang" >> $GITHUB_ENV
install: >- echo "PKG_CONFIG_SYSROOT_DIR=/" >> $GITHUB_ENV
base-devel
mingw-w64-x86_64-rust
- uses: actions/cache@v3 - uses: actions/cache@v3
with: with:
path: | path: |
@@ -175,7 +173,8 @@ jobs:
run: | run: |
zip scryer-prolog_macos-11.zip ./scryer-prolog_macos-11_x86_64-apple-darwin/scryer-prolog zip scryer-prolog_macos-11.zip ./scryer-prolog_macos-11_x86_64-apple-darwin/scryer-prolog
zip scryer-prolog_ubuntu-20.04.zip ./scryer-prolog_ubuntu-20.04_x86_64-unknown-linux-gnu/scryer-prolog zip scryer-prolog_ubuntu-20.04.zip ./scryer-prolog_ubuntu-20.04_x86_64-unknown-linux-gnu/scryer-prolog
zip scryer-prolog_windows-latest.zip ./scryer-prolog_windows-latest_x86_64-pc-windows-gnu/scryer-prolog.exe zip scryer-prolog_ubuntu-22.04.zip ./scryer-prolog_ubuntu-22.04_x86_64-unknown-linux-gnu/scryer-prolog
zip scryer-prolog_windows-latest.zip ./scryer-prolog_windows-latest_x86_64-pc-windows-msvc/scryer-prolog.exe
zip -r scryer-prolog_unknown-wasm32.zip ./scryer-prolog_unknown_wasm32 zip -r scryer-prolog_unknown-wasm32.zip ./scryer-prolog_unknown_wasm32
- name: Release - name: Release
uses: softprops/action-gh-release@v1 uses: softprops/action-gh-release@v1
@@ -183,5 +182,6 @@ jobs:
files: | files: |
scryer-prolog_macos-11.zip scryer-prolog_macos-11.zip
scryer-prolog_ubuntu-20.04.zip scryer-prolog_ubuntu-20.04.zip
scryer-prolog_ubuntu-22.04.zip
scryer-prolog_windows-latest.zip scryer-prolog_windows-latest.zip
scryer-prolog_unknown-wasm32.zip scryer-prolog_unknown-wasm32.zip