wip: nixify

7mind · Oct 28, 2024 · 5854ab7 · 5854ab7
1 parent 583c739
commit 5854ab7
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 197 deletions.
diff --git a/.build.sh b/.build.sh
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -31,8 +31,6 @@ jobs:
         scala: [ '2.12', '2.13', '3' ]
     steps:
       - uses: 7mind/github-env@minimal
-        with:
-          java-version: ${{ matrix.java }}
       - name: Build and Test with Coverage
         env:
           SCALA_VERSION: ${{ matrix.scala }}
@@ -47,12 +45,10 @@ jobs:
         run: ./build.sh nix gen test
       - uses: dorny/test-reporter@v1
         if: (needs.checksecret.outputs.HAVE_SECRETS == 'true') && (success() || failure())
-#        continue-on-error: ${{ matrix.scala == '3' }}
         with:
           name: Test reports (JDK ${{ matrix.java }}, Scala ${{ matrix.scala }}, JVM)
           path: '**/target/test-reports/TEST-*.xml'
           reporter: java-junit
-#          fail-on-error: ${{ matrix.scala != '3' }}
       - uses: bitwarden/sm-action@v2
         if: (needs.checksecret.outputs.HAVE_SECRETS == 'true') && (success() || failure())
         with:
@@ -64,9 +60,9 @@ jobs:
         continue-on-error: true
         with:
           token: ${{ env.TOKEN_CODECOV }}
-          verbose: true # optional (default = false)
-#          fail_ci_if_error: ${{ matrix.scala != '3' }}
+          verbose: true
           files: "**/cobertura.xml"
+          #          fail_ci_if_error: ${{ matrix.scala != '3' }}
           # TODO: do we need scoverage.xml? If so files: may be just omitted
           # files: cobertura.xml,scoverage.xml
           # flags: unittests
@@ -84,8 +80,6 @@ jobs:
         scala: [ '2.12', '2.13', '3' ]
     steps:
       - uses: 7mind/github-env@minimal
-        with:
-          java-version: ${{ matrix.java }}
       - name: Build and Test with Coverage
         env:
           SCALA_VERSION: ${{ matrix.scala }}
@@ -100,12 +94,10 @@ jobs:
         run: ./build.sh nix gen-jsonly test
       - uses: dorny/test-reporter@v1
         if: (needs.checksecret.outputs.HAVE_SECRETS == 'true') && (success() || failure())
-#        continue-on-error: ${{ matrix.scala == '3' }}
         with:
           name: Test reports (JDK ${{ matrix.java }}, Scala ${{ matrix.scala }}, JS)
           path: '**/target/test-reports/TEST-*.xml'
           reporter: java-junit
-#          fail-on-error: ${{ matrix.scala != '3' }}
 
   test-site:
     runs-on: ubuntu-latest
@@ -115,8 +107,6 @@ jobs:
         scala: [ '2.13']
     steps:
       - uses: 7mind/github-env@minimal
-        with:
-          java-version: ${{ matrix.java }}
       - name: Build Microsite
         env:
           SCALA_VERSION: ${{ matrix.scala }}
@@ -133,8 +123,6 @@ jobs:
     if: needs.checksecret.outputs.HAVE_SECRETS == 'true'
     steps:
       - uses: 7mind/github-env@minimal
-        with:
-          java-version: ${{ matrix.java }}
       - uses: bitwarden/sm-action@v2
         with:
           access_token: ${{ secrets.TOKEN_BITWARDEN_SM }}
@@ -148,13 +136,8 @@ jobs:
         env:
           SCALA_VERSION: ${{ matrix.scala }}
           JAVA_VERSION: ${{ matrix.java }}
-          SONATYPE_SECRET: .secrets/credentials.sonatype-nexus.properties
         run: ./build.sh nix gen-js site-publish
-#          mkdir .secrets
-#          echo "$SONATYPE_CREDENTIALS_FILE" > "$SONATYPE_SECRET"
-#          openssl aes-256-cbc -K ${OPENSSL_KEY} -iv ${OPENSSL_IV} -in secrets.tar.enc -out secrets.tar -d
-#          tar xvf secrets.tar
-
+
   publish-artifacts:
     runs-on: ubuntu-latest
     needs: [ 'build-jvm', 'build-js', 'checksecret' ]
@@ -166,8 +149,6 @@ jobs:
         scala: [ '2.12', '2.13', '3']
     steps:
       - uses: 7mind/github-env@minimal
-        with:
-          java-version: ${{ matrix.java }}
       - uses: bitwarden/sm-action@v2
         with:
           access_token: ${{ secrets.TOKEN_BITWARDEN_SM }}
@@ -187,7 +168,6 @@ jobs:
           tar xvf secrets.tar
           
           ./build.sh nix gen-js publish-scala
-#        continue-on-error: ${{ matrix.scala == '3' }}
 
   all-good:
     if: always()

diff --git a/flake.nix b/flake.nix
@@ -26,6 +26,8 @@
 
             nodejs
             nodePackages.npm
+
+            gitMinimal
           ];
 
           shellHook = ''
-Original file line number
+Diff line change
@@ Expand Up / @@ -26,6 +26,8 @@ @@
                 nodejs
                 nodePackages.npm
+                gitMinimal
               ];
               shellHook = ''
@@ Expand Down @@