Merge pull request #49 from ngrok/nikolay/glibc-2.17

add build targeting glibc 2.24
ngrok · May 10, 2024 · c7ee30e · c7ee30e
2 parents 9286723 + 5d26ef4
commit c7ee30e
Show file tree

Hide file tree

Showing 2 changed files with 51 additions and 2 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -31,6 +31,38 @@ jobs:
         env:
           NGROK_AUTHTOKEN: ${{ secrets.NGROK_AUTHTOKEN }}
 
+  build-glibc-2_24:
+    name: Build Ngrok Java (glibc 2.24)
+    runs-on: ubuntu-latest
+    container: quay.io/pypa/manylinux_2_24_x86_64
+    steps:
+      - uses: actions/checkout@v3
+      - uses: dtolnay/rust-toolchain@master
+        with:
+          toolchain: stable
+          targets: x86_64-unknown-linux-gnu
+      - uses: ./.github/workflows/rust-cache
+      - uses: actions/setup-java@v3
+        with:
+          java-version: |
+            17
+            11
+          distribution: 'temurin'
+          cache: 'maven'
+      - name: Install maven
+        run: |
+          curl -sL https://dlcdn.apache.org/maven/maven-3/3.8.8/binaries/apache-maven-3.8.8-bin.tar.gz -o maven.tar.gz
+          echo "332088670d14fa9ff346e6858ca0acca304666596fec86eea89253bd496d3c90deae2be5091be199f48e09d46cec817c6419d5161fb4ee37871503f472765d00 maven.tar.gz" | sha512sum -c -
+          tar xvf maven.tar.gz
+          rm maven.tar.gz
+          echo "JAVA_11_HOME=$JAVA_HOME_11_X64" >> $GITHUB_ENV
+          echo "JAVA_17_HOME=$JAVA_HOME_17_X64" >> $GITHUB_ENV
+          echo "./apache-maven-3.8.8/bin/" >> $GITHUB_PATH
+      - name: Verification
+        run: mvn --global-toolchains toolchains.xml --batch-mode verify 
+        env:
+          NGROK_AUTHTOKEN: ${{ secrets.NGROK_AUTHTOKEN }}
+
   udeps:
     name: Udeps
     runs-on: ubuntu-latest

diff --git a/.github/workflows/release-perform.yml b/.github/workflows/release-perform.yml
@@ -26,6 +26,7 @@ jobs:
           - host: ubuntu-latest
             target: x86_64-unknown-linux-gnu
             artifact: linux-x86_64
+            container: quay.io/pypa/manylinux_2_24_x86_64
           - host: ubuntu-latest
             target: aarch64-unknown-linux-gnu
             artifact: linux-aarch_64
@@ -48,14 +49,14 @@ jobs:
           - host: windows-latest
             target: x86_64-pc-windows-msvc
             artifact: windows-x86_64
-          - host: macos-latest
+          - host: macos-13
             target: x86_64-apple-darwin
             artifact: osx-x86_64
           - host: macos-latest
             target: aarch64-apple-darwin
             artifact: osx-aarch_64
-            pkgFlags: "--define 'skipTests'"
     runs-on: ${{ matrix.config.host }}
+    container: ${{ matrix.config.container }}
     steps:
       - uses: actions/checkout@v3
         with:
@@ -99,9 +100,25 @@ jobs:
           java-version: "11"
           distribution: "temurin"
       - name: Run mvn package for native
+        if: ${{ ! matrix.config.container }}
         run: mvn --batch-mode --projects ngrok-java-native --also-make package --activate-profiles ci-native --define 'ngrok.native.classifier=${{ matrix.config.artifact }}' --define 'ngrok.native.target=${{ matrix.config.target }}' ${{ matrix.config.pkgFlags }}
         env:
           NGROK_AUTHTOKEN: ${{ secrets.NGROK_AUTHTOKEN }}
+      - name: Install maven (with container)
+        if: matrix.config.container
+        run: |
+          curl -sL https://dlcdn.apache.org/maven/maven-3/3.8.8/binaries/apache-maven-3.8.8-bin.tar.gz -o maven.tar.gz
+          echo "332088670d14fa9ff346e6858ca0acca304666596fec86eea89253bd496d3c90deae2be5091be199f48e09d46cec817c6419d5161fb4ee37871503f472765d00 maven.tar.gz" | sha512sum -c -
+          tar xvf maven.tar.gz
+          rm maven.tar.gz
+          echo "JAVA_11_HOME=$JAVA_HOME_11_X64" >> $GITHUB_ENV
+          echo "JAVA_17_HOME=$JAVA_HOME_11_X64" >> $GITHUB_ENV
+          echo "./apache-maven-3.8.8/bin/" >> $GITHUB_PATH
+      - name: Run mvn package for native (with container)
+        if: matrix.config.container
+        run: mvn --global-toolchains toolchains.xml --batch-mode --projects ngrok-java-native --also-make package --activate-profiles ci-native --define 'ngrok.native.classifier=${{ matrix.config.artifact }}' --define 'ngrok.native.target=${{ matrix.config.target }}' ${{ matrix.config.pkgFlags }}
+        env:
+          NGROK_AUTHTOKEN: ${{ secrets.NGROK_AUTHTOKEN }}
       - name: Upload Artifacts
         uses: actions/upload-artifact@v3
         with: