Musl build fix

Infisical · Aug 12, 2024 · d64b51f · d64b51f
1 parent 36f82f8
commit d64b51f
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 14 deletions.
diff --git a/.github/workflows/build-c-bindings.yml b/.github/workflows/build-c-bindings.yml
@@ -56,11 +56,26 @@ jobs:
                   tar -xzf aarch64-linux-musl-cross.tgz
                   echo "$PWD/aarch64-linux-musl-cross/bin" >> $GITHUB_PATH
 
-            - name: Install cross-compilation tools for x86_64-musl
+            - name: Install MUSL (x86 Linux) toolchains
               if: matrix.settings.target == 'x86_64-unknown-linux-musl'
               run: |
                   sudo apt-get update
-                  sudo apt-get install -y musl-tools
+
+                  sudo apt-get install -y \
+                      wget \
+                      build-essential \
+                      musl-tools
+
+                  mkdir -p ${HOME}/musl_toolchains
+                  cd ${HOME}/musl_toolchains
+
+                  wget https://musl.cc/x86_64-linux-musl-cross.tgz
+                  tar -xzf x86_64-linux-musl-cross.tgz
+                  rm x86_64-linux-musl-cross.tgz
+
+                  echo "${HOME}/musl_toolchains/x86_64-linux-musl-cross/bin" >> $GITHUB_PATH
+
+                  x86_64-linux-musl-gcc --version
 
             - name: Build Rust (GNU/Others)
               if: ${{ !endsWith(matrix.settings.target, '-linux-musl') }}
@@ -74,6 +89,7 @@ jobs:
               env:
                   RUSTFLAGS: "-D warnings -C target-feature=-crt-static"
                   CARGO_TARGET_AARCH64_UNKNOWN_LINUX_MUSL_LINKER: aarch64-linux-musl-gcc
+                  CARGO_TARGET_X86_64_UNKNOWN_LINUX_MUSL_LINKER: x86_64-linux-musl-gcc
               run: cargo build --target ${{ matrix.settings.target }} --release --workspace --exclude infisical-py
 
             - name: Upload Artifact

diff --git a/.github/workflows/release-java.yml b/.github/workflows/release-java.yml
@@ -3,8 +3,8 @@ run-name: Release Java SDK
 
 on:
     push:
-        tags:
-            - "*.*.*" # version, e.g. 1.0.0
+        # tags:
+        # - "*.*.*" # version, e.g. 1.0.0
 
 jobs:
     generate_schemas:
@@ -111,13 +111,13 @@ jobs:
                   echo "Listing files in languages/java/src/main/resources:"
                   ls -R languages/java/src/main/resources
 
-            - name: Publish Maven
-              working-directory: languages/java
-              run: |
-                  ./gradlew publishAndReleaseToMavenCentral --no-configuration-cache
-              env:
-                  ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.ORG_GRADLE_PROJECT_MAVENCENTRALUSERNAME }}
-                  ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.ORG_GRADLE_PROJECT_MAVENCENTRALPASSWORD }}
-                  ORG_GRADLE_PROJECT_signingInMemoryKey: ${{ secrets.ORG_GRADLE_PROJECT_SIGNINGINMEMORYKEY }}
-                  ORG_GRADLE_PROJECT_signingInMemoryKeyId: ${{ secrets.ORG_GRADLE_PROJECT_SIGNINGINMEMORYKEYID }} # Last 8 characters of the full key ID
-                  ORG_GRADLE_PROJECT_signingInMemoryKeyPassword: ${{ secrets.ORG_GRADLE_PROJECT_SIGNINGINMEMORYKEYPASSWORD }}
+            # - name: Publish Maven
+            #   working-directory: languages/java
+            #   run: |
+            #       ./gradlew publishAndReleaseToMavenCentral --no-configuration-cache
+            #   env:
+            #       ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.ORG_GRADLE_PROJECT_MAVENCENTRALUSERNAME }}
+            #       ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.ORG_GRADLE_PROJECT_MAVENCENTRALPASSWORD }}
+            #       ORG_GRADLE_PROJECT_signingInMemoryKey: ${{ secrets.ORG_GRADLE_PROJECT_SIGNINGINMEMORYKEY }}
+            #       ORG_GRADLE_PROJECT_signingInMemoryKeyId: ${{ secrets.ORG_GRADLE_PROJECT_SIGNINGINMEMORYKEYID }} # Last 8 characters of the full key ID
+            #       ORG_GRADLE_PROJECT_signingInMemoryKeyPassword: ${{ secrets.ORG_GRADLE_PROJECT_SIGNINGINMEMORYKEYPASSWORD }}