removed comments and prepared for merging

speedb-io · Oct 4, 2023 · 869c75e · 869c75e
1 parent 1cb14c2
commit 869c75e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 22 deletions.
diff --git a/.github/workflows/build_and_publish_jar.yml b/.github/workflows/build_and_publish_jar.yml
@@ -38,7 +38,6 @@ jobs:
     uses: ./.github/workflows/ci_macos.yml
     with:
       verSion: ${{ needs.pre_build.outputs.out1 }}     
-    #secrets: inherit
     secrets:
       AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
       AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
@@ -105,9 +104,11 @@ jobs:
         mvn versions:set -DnewVersion=$VERSION-SNAPSHOT
         mvn deploy -X -e -DskipTests
         
-        mvn versions:set -DnewVersion=$the_version
+        #mvn versions:set -DnewVersion=$the_version
         #mvn clean deploy -P release -X -e -DskipTests
         
-    - name: show path
+    - name: show next step
       run: |
-        echo "versions:set -DnewVersion=$VERSION-SNAPSHOT"
+        echo "Make sure the SNAPSHOT is fine and run these to publish the artifact"
+        echo "run: mvn versions:set -DnewVersion=$the_version"
+        echo "run: mvn clean deploy -P release -X -e -DskipTests"
diff --git a/.github/workflows/ci_macos.yml b/.github/workflows/ci_macos.yml
@@ -34,11 +34,7 @@ jobs:
         export CXXFLAGS="-I$JAVA_HOME/include"
         brew install zlib
         brew install bzip2 lz4 snappy
-        ROCKSDB_DISABLE_JEMALLOC=1 PORTABLE=1 DEBUG_LEVEL=0 make -j 2 rocksdbjavastatic
-
-  #  - name: 'upload artifacts'    #This step executed only when this workflow is called by another and a version is provided
-  #    if: inputs.verSion != ' '
-  #    run: aws s3 cp java/target/libspeedbjni-osx-x86_64.jnilib s3://spdb-builder/jar_test/v${{ inputs.verSion }}/libspeedbjni-osx-x86_64.jnilib
+        ROCKSDB_DISABLE_JEMALLOC=1 PORTABLE=1 DEBUG_LEVEL=0 make -j 2 rocksdbjavastatic #more CPU cores makes shared github runner to overload cpu and stop
 
     - name: Upload artifacts to S3
       if: inputs.verSion != ' '

diff --git a/.github/workflows/ci_windows.yml b/.github/workflows/ci_windows.yml
@@ -140,25 +140,12 @@ jobs:
             copy tools\thirdparty.txt thirdparty.inc # copy the thirdparty.inc that reflects the env on the runner machine
             mkdir build
             cd build
-            #& $Env:CMAKE_BIN -G "$Env:CMAKE_GENERATOR" -DCMAKE_BUILD_TYPE=Debug -DOPTDBG=1 -DPORTABLE=1 -DSNAPPY=1 -DJNI=1 ..
             & $Env:CMAKE_BIN -G "$Env:CMAKE_GENERATOR" -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CXX_STANDARD=20 -A x64 -DJNI=1 -DGFLAGS=1 -DOPTDBG=1 -DPORTABLE=1 -DSNAPPY=1 -DJNI=1 -DSNAPPY=1 -DLZ4=1 -DZLIB=1 -DZSTD=1 -DXPRESS=1 -DFAIL_ON_WARNINGS=0 ..
             cd ..
             echo "Building with VS version: $Env:CMAKE_GENERATOR"
             msbuild build/speedb.sln /p:Configuration=Release /t:speedbjni-shared
-            #msbuild.exe build/rocksdb.sln -maxCpuCount -property:Configuration=Debug -property:Platform=x64
             #msbuild.exe build/speedb.sln -maxCpuCount -property:Configuration=Debug -property:Platform=x64
 
-
-    #- name: 'build and present'
-    #  shell: powershell # For Linux, use bash
-    #  run: |
-    #    $env:THIRDPARTY_HOME='C:/Users/builder/code'
-    #    cp  $env:THIRDPARTY_HOME\thirdparty.inc .   # copy the thirdparty.inc that reflects the env on the runner machine
-    #    mkdir runner_bld
-    #    cd runner_bld
-    #    cmake -G "Visual Studio 17 2022" -A x64 -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_STANDARD=20 -DJNI=1 -DGFLAGS=1 -DSNAPPY=1 -DLZ4=1 -DZLIB=1 -DZSTD=1 -DXPRESS=1 -DFAIL_ON_WARNINGS=0 ..
-    #    msbuild speedb.sln /p:Configuration=Release /t:speedbjni-shared
-
       - name: Upload artifacts to S3
         if: inputs.verSion != ' '
         uses: NotCoffee418/s3-zip-upload@v1