From 4163437d5ac561e1efbc27ac36101b36be6e1838 Mon Sep 17 00:00:00 2001 From: infogulch Date: Wed, 27 Sep 2023 00:31:08 -0500 Subject: [PATCH 1/3] Add ubuntu 22.04 --- .github/workflows/ci.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 786defb1d..e94e81076 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,9 +19,10 @@ jobs: include: - { os: windows-latest, rust-version: stable, shell: 'msys2 {0}', target: 'x86_64-pc-windows-gnu'} - { os: macos-11, rust-version: stable, shell: bash, 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, shell: bash, target: 'x86_64-unknown-linux-gnu' } + - { os: ubuntu-20.04, rust-version: stable, shell: bash, target: 'x86_64-unknown-linux-gnu', extra: true } - { os: ubuntu-20.04, rust-version: stable, shell: bash, target: 'i686-unknown-linux-gnu' } - - { os: ubuntu-20.04, rust-version: "1.70", shell: bash, target: 'x86_64-unknown-linux-gnu'} + - { os: ubuntu-20.04, rust-version: "1.70", shell: bash, target: 'x86_64-unknown-linux-gnu'} - { os: ubuntu-20.04, rust-version: beta, shell: bash, target: 'x86_64-unknown-linux-gnu'} - { os: ubuntu-20.04, rust-version: nightly, shell: bash, target: 'x86_64-unknown-linux-gnu'} defaults: @@ -175,6 +176,7 @@ jobs: run: | 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-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-gnu/scryer-prolog.exe zip -r scryer-prolog_unknown-wasm32.zip ./scryer-prolog_unknown_wasm32 - name: Release @@ -183,5 +185,6 @@ jobs: files: | scryer-prolog_macos-11.zip scryer-prolog_ubuntu-20.04.zip + scryer-prolog_ubuntu-22.04.zip scryer-prolog_windows-latest.zip scryer-prolog_unknown-wasm32.zip From a86db1bde8cc912ebc8c929a926ff483b1e5e696 Mon Sep 17 00:00:00 2001 From: infogulch Date: Wed, 27 Sep 2023 02:57:02 -0500 Subject: [PATCH 2/3] Build windows with msvc --- .github/workflows/ci.yml | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e94e81076..91b91b48a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,7 +17,7 @@ jobs: fail-fast: false matrix: include: - - { os: windows-latest, rust-version: stable, shell: 'msys2 {0}', target: 'x86_64-pc-windows-gnu'} + - { os: windows-latest, rust-version: stable, shell: bash, target: 'x86_64-pc-windows-msvc'} - { os: macos-11, rust-version: stable, shell: bash, target: 'x86_64-apple-darwin' } - { os: ubuntu-22.04, rust-version: stable, shell: bash, target: 'x86_64-unknown-linux-gnu' } - { os: ubuntu-20.04, rust-version: stable, shell: bash, target: 'x86_64-unknown-linux-gnu', extra: true } @@ -31,7 +31,6 @@ jobs: steps: - uses: actions/checkout@v3 - uses: dtolnay/rust-toolchain@master - if: "!contains(matrix.os,'windows')" id: toolchain with: toolchain: ${{ matrix.rust-version }} @@ -40,13 +39,6 @@ jobs: - name: Install i686 dependencies 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 - - uses: msys2/setup-msys2@v2 - if: contains(matrix.os,'windows') - with: - update: true - install: >- - base-devel - mingw-w64-x86_64-rust - uses: actions/cache@v3 with: path: | @@ -177,7 +169,7 @@ jobs: 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-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-gnu/scryer-prolog.exe + 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 - name: Release uses: softprops/action-gh-release@v1 From 93f46a41420ba317f31bf72c83d138bbc410bc5f Mon Sep 17 00:00:00 2001 From: infogulch Date: Wed, 27 Sep 2023 02:58:48 -0500 Subject: [PATCH 3/3] Tidy ci.yaml --- .github/workflows/ci.yml | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 91b91b48a..27b4e9d5b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,17 +17,17 @@ jobs: fail-fast: false matrix: include: - - { os: windows-latest, rust-version: stable, shell: bash, target: 'x86_64-pc-windows-msvc'} - - { os: macos-11, rust-version: stable, shell: bash, target: 'x86_64-apple-darwin' } - - { os: ubuntu-22.04, rust-version: stable, shell: bash, target: 'x86_64-unknown-linux-gnu' } - - { os: ubuntu-20.04, rust-version: stable, shell: bash, target: 'x86_64-unknown-linux-gnu', extra: true } - - { os: ubuntu-20.04, rust-version: stable, shell: bash, target: 'i686-unknown-linux-gnu' } - - { os: ubuntu-20.04, rust-version: "1.70", shell: bash, target: 'x86_64-unknown-linux-gnu'} - - { os: ubuntu-20.04, rust-version: beta, shell: bash, target: 'x86_64-unknown-linux-gnu'} - - { os: ubuntu-20.04, rust-version: nightly, shell: bash, target: 'x86_64-unknown-linux-gnu'} + - { os: windows-latest, rust-version: stable, target: 'x86_64-pc-windows-msvc'} + - { os: macos-11, rust-version: stable, target: 'x86_64-apple-darwin' } + - { os: ubuntu-22.04, rust-version: stable, target: 'x86_64-unknown-linux-gnu' } + - { os: ubuntu-20.04, rust-version: stable, target: 'x86_64-unknown-linux-gnu', extra: true } + - { os: ubuntu-20.04, rust-version: stable, target: 'i686-unknown-linux-gnu' } + - { os: ubuntu-20.04, rust-version: "1.70", 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: run: - shell: ${{ matrix.shell }} + shell: bash steps: - uses: actions/checkout@v3 - uses: dtolnay/rust-toolchain@master @@ -38,7 +38,12 @@ jobs: components: clippy, rustfmt - name: Install i686 dependencies 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: | + 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 - uses: actions/cache@v3 with: path: |