From 80de0f0bbe66c4404b2fe2791852566a8ab28821 Mon Sep 17 00:00:00 2001 From: Andrew Ferrazzutti Date: Tue, 25 Apr 2023 01:43:48 +0900 Subject: [PATCH 1/3] Build Node bindings against Ubuntu 20.04 Fixes #1808 --- .github/workflows/bindings_ci.yml | 4 ++-- .github/workflows/release-crypto-nodejs.yml | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/bindings_ci.yml b/.github/workflows/bindings_ci.yml index 44b82ff15..9369901b3 100644 --- a/.github/workflows/bindings_ci.yml +++ b/.github/workflows/bindings_ci.yml @@ -92,10 +92,10 @@ jobs: strategy: fail-fast: true matrix: - os: [ubuntu-latest] + os: [ubuntu-20.04] node-version: [16.0, 18.0, 19.0, 20.0] include: - - os: ubuntu-latest + - os: ubuntu-20.04 os-name: 🐧 - os: macos-latest diff --git a/.github/workflows/release-crypto-nodejs.yml b/.github/workflows/release-crypto-nodejs.yml index d682a3e60..0f953264e 100644 --- a/.github/workflows/release-crypto-nodejs.yml +++ b/.github/workflows/release-crypto-nodejs.yml @@ -40,18 +40,18 @@ jobs: include: # ----------------------------------- Linux - target: x86_64-unknown-linux-gnu - os: ubuntu-latest + os: ubuntu-20.04 - target: i686-unknown-linux-gnu apt_install: gcc-i686-linux-gnu g++-i686-linux-gnu - os: ubuntu-latest + os: ubuntu-20.04 - target: aarch64-unknown-linux-gnu - os: ubuntu-latest + os: ubuntu-20.04 apt_install: gcc-aarch64-linux-gnu g++-aarch64-linux-gnu - target: arm-unknown-linux-gnueabihf - os: ubuntu-latest + os: ubuntu-20.04 apt_install: gcc-arm-linux-gnueabihf - target: x86_64-unknown-linux-musl - os: ubuntu-latest + os: ubuntu-20.04 # ----------------------------------- macOS - target: aarch64-apple-darwin os: macos-latest From 4bbea71d51809e1f9bd4a8ede85d39d7464752d7 Mon Sep 17 00:00:00 2001 From: Andrew Ferrazzutti Date: Wed, 26 Apr 2023 15:44:25 +0900 Subject: [PATCH 2/3] Add comment to explain why to use Ubuntu LTS-1 --- .github/workflows/bindings_ci.yml | 1 + .github/workflows/release-crypto-nodejs.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/.github/workflows/bindings_ci.yml b/.github/workflows/bindings_ci.yml index 9369901b3..a8f98565e 100644 --- a/.github/workflows/bindings_ci.yml +++ b/.github/workflows/bindings_ci.yml @@ -92,6 +92,7 @@ jobs: strategy: fail-fast: true matrix: + # Use Ubuntu LTS-1 for broader glibc compatibility. os: [ubuntu-20.04] node-version: [16.0, 18.0, 19.0, 20.0] include: diff --git a/.github/workflows/release-crypto-nodejs.yml b/.github/workflows/release-crypto-nodejs.yml index 0f953264e..d3fa93a65 100644 --- a/.github/workflows/release-crypto-nodejs.yml +++ b/.github/workflows/release-crypto-nodejs.yml @@ -39,6 +39,7 @@ jobs: matrix: include: # ----------------------------------- Linux + # Use Ubuntu LTS-1 for broader glibc compatibility. - target: x86_64-unknown-linux-gnu os: ubuntu-20.04 - target: i686-unknown-linux-gnu From 8e0559963eef44716cd76ca12922b2bd0802a759 Mon Sep 17 00:00:00 2001 From: Andrew Ferrazzutti Date: Wed, 26 Apr 2023 20:25:57 +0900 Subject: [PATCH 3/3] Restore "Install musl-gcc for linux-musl nodejs releases" This reverts commit cfc6ec2c0dcf3be94054aad9395fd1038e65ff8a. --- .github/workflows/prep-crypto-nodejs-release.yml | 2 +- .github/workflows/release-crypto-nodejs.yml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/prep-crypto-nodejs-release.yml b/.github/workflows/prep-crypto-nodejs-release.yml index 1c702bea4..d0e609994 100644 --- a/.github/workflows/prep-crypto-nodejs-release.yml +++ b/.github/workflows/prep-crypto-nodejs-release.yml @@ -110,7 +110,7 @@ jobs: trigger-release: # and trigger the tagging release workflow - uses: matrix-org/matrix-rust-sdk/.github/workflows/release-crypto-nodejs.yml@main + uses: ./.github/workflows/release-crypto-nodejs.yml needs: ['prepare-release'] name: "Trigger release Workflow" with: diff --git a/.github/workflows/release-crypto-nodejs.yml b/.github/workflows/release-crypto-nodejs.yml index d3fa93a65..9448e0bdc 100644 --- a/.github/workflows/release-crypto-nodejs.yml +++ b/.github/workflows/release-crypto-nodejs.yml @@ -53,6 +53,7 @@ jobs: apt_install: gcc-arm-linux-gnueabihf - target: x86_64-unknown-linux-musl os: ubuntu-20.04 + apt_install: musl-tools # ----------------------------------- macOS - target: aarch64-apple-darwin os: macos-latest