<fix> publish workflow not found gnu toolchain

<fix> publish workflow not found gnu toolchain <fix> publish workflow not found gnu toolchain <fix> publish workflow not found gnu toolchain <fix> publish workflow not found gnu toolchain <fix> publish workflow not found gnu toolchain <fix> publish workflow not found gnu toolchain <fix> publish workflow not found gnu toolchain <fix> publish workflow not found gnu toolchain <fix> publish workflow not found gnu toolchain <fix> publish workflow not found gnu toolchain <fix> publish workflow not found gnu toolchain <fix> publish workflow not found gnu toolchain <fix> publish workflow not found gnu toolchain <fix> publish workflow not found gnu toolchain <fix> publish workflow not found gnu toolchain <fix> publish workflow not found gnu toolchain
kgit2 · Jan 8, 2025 · 2a6eea3 · 2a6eea3
1 parent e29c365
commit 2a6eea3
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 42 deletions.
diff --git a/.github/workflows/kommand publish.yml b/.github/workflows/kommand publish.yml
@@ -31,42 +31,40 @@ jobs:
       - name: Set up just
         run: cargo install just
 
-#      - name: Set up JDK 17
-#        uses: actions/[email protected]
-#        with:
-#          java-version: '17'
-#          distribution: 'microsoft'
-#          architecture: ${{ matrix.jdk_arch }}
-#
-#      - name: Setup Gradle
-#        uses: gradle/actions/setup-gradle@v3
+      - name: Set up JDK 17
+        uses: actions/[email protected]
+        with:
+          java-version: '17'
+          distribution: 'microsoft'
+          architecture: ${{ matrix.jdk_arch }}
+
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v3
 
       - name: Set up cross-compiler
         run: just prepare
+        working-directory: kommand-core
+
+      - name: Build kommand-core
+        run: just all
+        working-directory: kommand-core
+
+      - name: Import GPG key
+        run: |
+          mkdir -p $HOME/.gradle
+          echo "${{ secrets.GPG_PRIVATE_KEY }}" | base64 --decode > $HOME/.gradle/secret.gpg
+          just importKey
 
-      - name: Check gnu toolchain
-        run: just check
+      - name: Publish to sonatype
+        run: |
+          just ciPublish \
+            ${{ secrets.SONATYPE_USERNAME }} \
+            ${{ secrets.SONATYPE_PASSWORD }} \
+            ${{ secrets.GPG_KEY_ID }} \
+            ${{ secrets.GPG_PASSPHRASE }}
 
-#      - name: Build kommand-core
-#        run: just all
-#        working-directory: kommand-core
-#
-#      - name: Import GPG key
-#        run: |
-#          mkdir -p $HOME/.gradle
-#          echo "${{ secrets.GPG_PRIVATE_KEY }}" | base64 --decode > $HOME/.gradle/secret.gpg
-#          just importKey
-#
-#      - name: Publish to sonatype
-#        run: |
-#          just ciPublish \
-#            ${{ secrets.SONATYPE_USERNAME }} \
-#            ${{ secrets.SONATYPE_PASSWORD }} \
-#            ${{ secrets.GPG_KEY_ID }} \
-#            ${{ secrets.GPG_PASSPHRASE }}
-#
-#      - name: Clean up GPG key
-#        if: always()
-#        run: |
-#          rm -f $HOME/.gradle/secret.gpg
-#          just deleteKey ${{ secrets.GPG_KEY_ID }}
+      - name: Clean up GPG key
+        if: always()
+        run: |
+          rm -f $HOME/.gradle/secret.gpg
+          just deleteKey ${{ secrets.GPG_KEY_ID }}
diff --git a/justfile b/justfile
@@ -5,14 +5,6 @@ prepare:
     brew tap messense/macos-cross-toolchains
     brew install x86_64-unknown-linux-gnu aarch64-unknown-linux-gnu
 
-check:
-    brew --prefix mingw-w64
-    brew --prefix x86_64-unknown-linux-gnu
-    brew --prefix aarch64-unknown-linux-gnu
-    where x86_64-unknown-linux-gnu-gcc
-    where aarch64-unknown-linux-gnu-gcc
-    echo $PATH
-
 clean:
     ./gradlew clean
 

diff --git a/kommand-core/justfile b/kommand-core/justfile
@@ -4,6 +4,17 @@ prepare:
     brew install mingw-w64
     brew tap messense/macos-cross-toolchains
     brew install x86_64-unknown-linux-gnu aarch64-unknown-linux-gnu
+    brew unlink x86_64-unknown-linux-gnu && brew link x86_64-unknown-linux-gnu
+    brew unlink aarch64-unknown-linux-gnu && brew link aarch64-unknown-linux-gnu
+
+check:
+    arch
+    brew --prefix mingw-w64
+    brew --prefix x86_64-unknown-linux-gnu
+    brew --prefix aarch64-unknown-linux-gnu
+    echo $PATH
+    which x86_64-linux-gnu-gcc
+    which aarch64-linux-gnu-gcc
 
 leaks:
     cargo build --package kommand-core --package kommand-echo