From 10535c099c4dbc75d574c3280e965dc61fed8f35 Mon Sep 17 00:00:00 2001 From: Raul Jordan Date: Thu, 1 Feb 2024 11:21:52 -0600 Subject: [PATCH 01/10] add basic ci for mac/linux --- .github/pull_request_template.md | 12 +++++++++++ .github/workflows/linux.yml | 34 +++++++++++++++++++++++++++++++ .github/workflows/mac.yml | 35 ++++++++++++++++++++++++++++++++ ci/build_and_test.sh | 18 ++++++++++++++++ 4 files changed, 99 insertions(+) create mode 100644 .github/pull_request_template.md create mode 100644 .github/workflows/linux.yml create mode 100644 .github/workflows/mac.yml create mode 100755 ci/build_and_test.sh diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md new file mode 100644 index 0000000..430fd37 --- /dev/null +++ b/.github/pull_request_template.md @@ -0,0 +1,12 @@ +## Description + +Please provide a summary of the changes and any backward incompatibilities. + +## Checklist + +- [ ] I have documented these changes where necessary. +- [ ] I have read the [DCO][DCO] and ensured that these changes comply. +- [ ] I assign this work under its [open source licensing][terms]. + +[DCO]: licenses/DCO.txt +[terms]: licenses/COPYRIGHT.md diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml new file mode 100644 index 0000000..a11077c --- /dev/null +++ b/.github/workflows/linux.yml @@ -0,0 +1,34 @@ +name: linux +on: + push: + branches: + - main + pull_request: + workflow_dispatch: + +jobs: + test: + runs-on: ubuntu-latest + name: (${{ matrix.target }}, ${{ matrix.cfg_release_channel }}) + env: + CFG_RELEASE_CHANNEL: ${{ matrix.cfg_release_channel }} + strategy: + matrix: + target: [ + x86_64-unknown-linux-gnu, + ] + cfg_release_channel: [nightly, stable] + + steps: + - name: checkout + uses: actions/checkout@v3 + + # Run build + - name: install rustup + run: | + curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs > rustup-init.sh + sh rustup-init.sh -y --default-toolchain none + rustup target add ${{ matrix.target }} + + - name: Build and Test + run: ./ci/build_and_test.sh diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml new file mode 100644 index 0000000..1a9afd1 --- /dev/null +++ b/.github/workflows/mac.yml @@ -0,0 +1,35 @@ +name: mac +on: + push: + branches: + - main + pull_request: + workflow_dispatch: + +jobs: + test: + runs-on: macos-latest + name: (${{ matrix.target }}, ${{ matrix.cfg_release_channel }}) + env: + CFG_RELEASE_CHANNEL: ${{ matrix.cfg_release_channel }} + strategy: + fail-fast: false + matrix: + target: [ + aarch64-apple-darwin, + ] + cfg_release_channel: [nightly, stable] + + steps: + - name: checkout + uses: actions/checkout@v3 + + # Run build + - name: install rustup + run: | + curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs > rustup-init.sh + sh rustup-init.sh -y --default-toolchain none + rustup target add ${{ matrix.target }} + + - name: Build and Test + run: ./ci/build_and_test.sh diff --git a/ci/build_and_test.sh b/ci/build_and_test.sh new file mode 100755 index 0000000..3d9f1cf --- /dev/null +++ b/ci/build_and_test.sh @@ -0,0 +1,18 @@ +#!/bin/bash + +set -euo pipefail + +export RUSTFLAGS="-D warnings" +export RUSTFMT_CI=1 + +# Print version information +rustc -Vv +cargo -V + +# Build and test main crate +if [ "$CFG_RELEASE_CHANNEL" == "nightly" ]; then + cargo build --locked --all-features +else + cargo build --locked +fi +cargo test --all-features \ No newline at end of file From f22c0d64930ded35ab5e09e35c1f79baffa54c9b Mon Sep 17 00:00:00 2001 From: Raul Jordan Date: Thu, 1 Feb 2024 11:22:43 -0600 Subject: [PATCH 02/10] branch --- .github/workflows/linux.yml | 2 +- .github/workflows/mac.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index a11077c..5248db8 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -2,7 +2,7 @@ name: linux on: push: branches: - - main + - master pull_request: workflow_dispatch: diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml index 1a9afd1..f262820 100644 --- a/.github/workflows/mac.yml +++ b/.github/workflows/mac.yml @@ -2,7 +2,7 @@ name: mac on: push: branches: - - main + - master pull_request: workflow_dispatch: From c04d97089e8e1d6c8f1fd8675c396406a6a1577c Mon Sep 17 00:00:00 2001 From: Raul Jordan Date: Thu, 1 Feb 2024 11:23:35 -0600 Subject: [PATCH 03/10] edit --- .github/pull_request_template.md | 12 ------------ 1 file changed, 12 deletions(-) delete mode 100644 .github/pull_request_template.md diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md deleted file mode 100644 index 430fd37..0000000 --- a/.github/pull_request_template.md +++ /dev/null @@ -1,12 +0,0 @@ -## Description - -Please provide a summary of the changes and any backward incompatibilities. - -## Checklist - -- [ ] I have documented these changes where necessary. -- [ ] I have read the [DCO][DCO] and ensured that these changes comply. -- [ ] I assign this work under its [open source licensing][terms]. - -[DCO]: licenses/DCO.txt -[terms]: licenses/COPYRIGHT.md From b115aaeb86c0ca37935810a759f5e5f3727b7f04 Mon Sep 17 00:00:00 2001 From: Raul Jordan Date: Thu, 1 Feb 2024 11:48:51 -0600 Subject: [PATCH 04/10] wasm --- .github/workflows/mac.yml | 35 ----------------------- .github/workflows/{linux.yml => wasm.yml} | 2 +- 2 files changed, 1 insertion(+), 36 deletions(-) delete mode 100644 .github/workflows/mac.yml rename .github/workflows/{linux.yml => wasm.yml} (95%) diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml deleted file mode 100644 index f262820..0000000 --- a/.github/workflows/mac.yml +++ /dev/null @@ -1,35 +0,0 @@ -name: mac -on: - push: - branches: - - master - pull_request: - workflow_dispatch: - -jobs: - test: - runs-on: macos-latest - name: (${{ matrix.target }}, ${{ matrix.cfg_release_channel }}) - env: - CFG_RELEASE_CHANNEL: ${{ matrix.cfg_release_channel }} - strategy: - fail-fast: false - matrix: - target: [ - aarch64-apple-darwin, - ] - cfg_release_channel: [nightly, stable] - - steps: - - name: checkout - uses: actions/checkout@v3 - - # Run build - - name: install rustup - run: | - curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs > rustup-init.sh - sh rustup-init.sh -y --default-toolchain none - rustup target add ${{ matrix.target }} - - - name: Build and Test - run: ./ci/build_and_test.sh diff --git a/.github/workflows/linux.yml b/.github/workflows/wasm.yml similarity index 95% rename from .github/workflows/linux.yml rename to .github/workflows/wasm.yml index 5248db8..d485f10 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/wasm.yml @@ -15,7 +15,7 @@ jobs: strategy: matrix: target: [ - x86_64-unknown-linux-gnu, + wasm32-unknown-unknown ] cfg_release_channel: [nightly, stable] From 6533e6b3d7c96ef21ed69766be2bbfdf80d87a44 Mon Sep 17 00:00:00 2001 From: Raul Jordan Date: Thu, 1 Feb 2024 12:00:08 -0600 Subject: [PATCH 05/10] edit --- ci/build_and_test.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ci/build_and_test.sh b/ci/build_and_test.sh index 3d9f1cf..59628de 100755 --- a/ci/build_and_test.sh +++ b/ci/build_and_test.sh @@ -11,8 +11,8 @@ cargo -V # Build and test main crate if [ "$CFG_RELEASE_CHANNEL" == "nightly" ]; then - cargo build --locked --all-features + cargo build --locked --all-features --target=wasm32-unknown-unknown else - cargo build --locked + cargo build --locked --target=wasm32-unknown-unknown fi -cargo test --all-features \ No newline at end of file +cargo test --all-features --target=wasm32-unknown-unknown \ No newline at end of file From d20cc53b8889553bcc23c4ed14360ebc42ae06fa Mon Sep 17 00:00:00 2001 From: Raul Jordan Date: Thu, 1 Feb 2024 13:36:11 -0600 Subject: [PATCH 06/10] ci addition --- ci/build_and_test.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ci/build_and_test.sh b/ci/build_and_test.sh index 59628de..91fc0ec 100755 --- a/ci/build_and_test.sh +++ b/ci/build_and_test.sh @@ -14,5 +14,4 @@ if [ "$CFG_RELEASE_CHANNEL" == "nightly" ]; then cargo build --locked --all-features --target=wasm32-unknown-unknown else cargo build --locked --target=wasm32-unknown-unknown -fi -cargo test --all-features --target=wasm32-unknown-unknown \ No newline at end of file +fi \ No newline at end of file From bcb430615f0308384f0207998addbe122a79fbb1 Mon Sep 17 00:00:00 2001 From: Raul Jordan Date: Thu, 1 Feb 2024 13:38:11 -0600 Subject: [PATCH 07/10] cleanup --- ci/build_and_test.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/build_and_test.sh b/ci/build_and_test.sh index 91fc0ec..05e786a 100755 --- a/ci/build_and_test.sh +++ b/ci/build_and_test.sh @@ -11,7 +11,7 @@ cargo -V # Build and test main crate if [ "$CFG_RELEASE_CHANNEL" == "nightly" ]; then - cargo build --locked --all-features --target=wasm32-unknown-unknown + cargo build --locked --all-features else - cargo build --locked --target=wasm32-unknown-unknown + cargo build --locked fi \ No newline at end of file From 7fcda9ae719b09be3fd30c2ebaedb6837d31c9f1 Mon Sep 17 00:00:00 2001 From: Raul Jordan Date: Thu, 1 Feb 2024 13:38:22 -0600 Subject: [PATCH 08/10] edit --- ci/build_and_test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/build_and_test.sh b/ci/build_and_test.sh index 05e786a..b241515 100755 --- a/ci/build_and_test.sh +++ b/ci/build_and_test.sh @@ -14,4 +14,4 @@ if [ "$CFG_RELEASE_CHANNEL" == "nightly" ]; then cargo build --locked --all-features else cargo build --locked -fi \ No newline at end of file +fi From a8f69563fb81a5d9b2f63f46a51cf62c374a7396 Mon Sep 17 00:00:00 2001 From: Raul Jordan Date: Thu, 1 Feb 2024 13:50:36 -0600 Subject: [PATCH 09/10] edit --- ci/build_and_test.sh | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/ci/build_and_test.sh b/ci/build_and_test.sh index b241515..def34eb 100755 --- a/ci/build_and_test.sh +++ b/ci/build_and_test.sh @@ -10,8 +10,4 @@ rustc -Vv cargo -V # Build and test main crate -if [ "$CFG_RELEASE_CHANNEL" == "nightly" ]; then - cargo build --locked --all-features -else - cargo build --locked -fi +cargo build --locked --all-features \ No newline at end of file From bc2630955f9f6c30e5eb7841898fdd567bd12421 Mon Sep 17 00:00:00 2001 From: Raul Jordan Date: Thu, 1 Feb 2024 13:53:37 -0600 Subject: [PATCH 10/10] min --- .github/workflows/wasm.yml | 2 +- ci/{build_and_test.sh => build.sh} | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename ci/{build_and_test.sh => build.sh} (81%) diff --git a/.github/workflows/wasm.yml b/.github/workflows/wasm.yml index d485f10..a2aec24 100644 --- a/.github/workflows/wasm.yml +++ b/.github/workflows/wasm.yml @@ -31,4 +31,4 @@ jobs: rustup target add ${{ matrix.target }} - name: Build and Test - run: ./ci/build_and_test.sh + run: ./ci/build.sh diff --git a/ci/build_and_test.sh b/ci/build.sh similarity index 81% rename from ci/build_and_test.sh rename to ci/build.sh index def34eb..e919fbe 100755 --- a/ci/build_and_test.sh +++ b/ci/build.sh @@ -10,4 +10,4 @@ rustc -Vv cargo -V # Build and test main crate -cargo build --locked --all-features \ No newline at end of file +cargo build --locked --all-features