cleanup

Author: azahnen

.github/workflows/xtracfg.yml

@@ -8,15 +8,15 @@ jobs:
     strategy:
       matrix:
         os:
-          #- runner: ubuntu-24.04
-          #  type: linux
-          #  platform: linux-amd64
-          #          - runner: ubuntu-24.04-arm
-          #            type: linux
-          #            platform: linux-arm64
-          #          - runner: macos-14
-          #            type: macos
-          #            platform: darwin-arm64
+          - runner: ubuntu-24.04
+            type: linux
+            platform: linux-amd64
+          - runner: ubuntu-24.04-arm
+            type: linux
+            platform: linux-arm64
+          - runner: macos-14
+            type: macos
+            platform: darwin-arm64
           - runner: windows-2022
             type: windows
             platform: windows-amd64
@@ -55,7 +55,6 @@ jobs:
           CFLAGS="-fPIC" ./configure --static
           make
       - name: java
-        continue-on-error: true
         working-directory: ./libxtracfg/java
         run: |
           ./gradlew nativeCompile -PLIB=true
@@ -73,7 +72,6 @@ jobs:
           ./test.sh
       - name: c
         if: ${{ matrix.os.type == 'windows' }}
-        continue-on-error: true
         working-directory: ./libxtracfg/c
         run: |
           ./build.bat
@@ -82,14 +80,12 @@ jobs:
         run: |
           ls -l ./libxtracfg/c/build
       - name: js
-        continue-on-error: true
         working-directory: ./libxtracfg/js/xtracfg-native-binding
         run: |
           npm --loglevel verbose ci
           npm --loglevel verbose run prebuildify
           npm --loglevel verbose run test
       - name: log3
-        continue-on-error: true
         run: |
           ls -R ./libxtracfg/js/xtracfg-native-binding/prebuilds
       # TODO: run tests for java, c, go
@@ -117,30 +113,25 @@ jobs:
           name: libxtracfg-js-${{ matrix.os.platform }}
           path: ./libxtracfg/js/xtracfg-native-binding/prebuilds
           retention-days: 1
-      - uses: actions/upload-artifact@v4
-        with:
-          name: npm-logs
-          path: C:\\npm\\cache\\_logs
-          retention-days: 1
 
   build_binaries:
     runs-on: ${{ matrix.os.runner }}
     needs: build_libraries
     strategy:
       matrix:
         os:
-          #          - runner: ubuntu-24.04
-          #            type: linux
-          #            platform: linux-amd64
-          #          - runner: ubuntu-24.04-arm
-          #            type: linux
-          #            platform: linux-arm64
-          #          - runner: macos-14
-          #            type: macos
-          #            platform: darwin-arm64
-          - runner: windows-2022
-            type: windows
-            platform: windows-amd64
+          - runner: ubuntu-24.04
+            type: linux
+            platform: linux-amd64
+          - runner: ubuntu-24.04-arm
+            type: linux
+            platform: linux-arm64
+          - runner: macos-14
+            type: macos
+            platform: darwin-arm64
+          #- runner: windows-2022
+          #  type: windows
+          #  platform: windows-amd64
     defaults:
       run:
         working-directory: ./xtracfg
@@ -234,7 +225,6 @@ jobs:
           ls -lR ./**/build
 
   publish_docker:
-    if: ${{ github.ref_type == 'linux' }}
     runs-on: ubuntu-latest
     needs: build_binaries
     steps:

libxtracfg/c/build.bat

@@ -11,11 +11,8 @@ cd %OUT_DIR%
 
 echo lib
 
-REM ls -l -R %JAVA_HOME%
-
 REM static
 cl.exe /c /MD /W4 /I./ /I%JAVA_HOME%/include /I%JAVA_HOME%/include/%PLATFORM% /Folibxtracfg.obj ../wrapper/libxtracfg.c
-REM copy libxtracfgjni_static.lib libxtracfg.lib
 lib.exe /OUT:libxtracfg.lib /VERBOSE libxtracfg.obj libxtracfgjni_static.lib
 
 certutil -hashfile libxtracfg.lib SHA1 > libxtracfg.sha1sum.tmp

libxtracfg/c/test.bat

@@ -4,14 +4,8 @@ set DIR=%~dp0
 set DIR=%DIR:~0,-1%
 set DIR=D:\\a\\xtraplatform-cli\\xtraplatform-cli\\libxtracfg\\c
 
-cp C:\hostedtoolcache\windows\graalvm-jdk-21_windows-x64_bin\21.0.0\x64\graalvm-jdk-21.0.9+7.1/bin/server\jvm.dll build\
-
-ls -l build
-
 cd build
 
 cmd.exe /c test.exe "{\"command\": \"info\", \"source\": \"%DIR%\", \"debug\": \"true\", \"verbose\": \"true\"}"
 
-dumpbin /dependents test.exe
-
 ldd test.exe

libxtracfg/go/xtracfg/client.go

@@ -3,7 +3,7 @@ package xtracfg
 /*
 #cgo CFLAGS: -I ../../c/include
 #cgo LDFLAGS: -L../../c/build -lxtracfg
-#cgo windows LDFLAGS: -L../../c/build -lxtracfg -lxtracfgjni_static_ext
+#cgo windows LDFLAGS: -lxtracfgjni_static_ext
 
 #include <stdlib.h>
 #include "libxtracfg.h"