Merge remote-tracking branch 'origin/all-in-one' into all-in-one

Readon · Oct 31, 2023 · 260682c · 260682c
2 parents ed92bbc + cf738db
commit 260682c
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 18 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -52,11 +52,6 @@ jobs:
         run: |
           bash make-msys2-installer ${{ matrix.scalaVersion }} ${{ matrix.spinalVersion }}
 
-      - name: Create 'latest' Variants and Checksums
-        run: |
-          sha256sum.exe msys2-*
-          sha256sum.exe msys2-* > msys2-checksums.txt
-
       - name: Upload Results
         uses: actions/upload-artifact@v3
         with:
@@ -116,29 +111,36 @@ jobs:
         with:
           name: installer
 
+      - name: Create 'latest' Variants and Checksums
+        run: |
+          sha256sum msys2-*
+          sha256sum msys2-* > msys2-checksums.txt
+
       - name: Set Release Tag
         id: set_tag
         if: startsWith(github.ref, 'refs/heads/')
-        run: echo "::set-output name=tag_name::all-in-one-$(date +'%Y%m%d%H%M%S')"
+        run: echo "tag_name=all-in-one-$(date +'%Y%m%d%H%M%S')" >> $GITHUB_OUTPUT
 
       - name: Upload Installers
-        uses: softprops/action-gh-release@v1
+        uses: ncipollo/release-action@v1
         if: startsWith(github.ref, 'refs/heads/')
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
-          tag_name: ${{ steps.set_tag.outputs.tag_name }}
+          tag: ${{ steps.set_tag.outputs.tag_name }}
+          token: ${{ secrets.GITHUB_TOKEN }}
           draft: true
-          body: ${{ github.event.head_commit.message }}
-          files: |
-            msys2-*
+          generateReleaseNotes: true
+          artifacts: "msys2-*"
+
 
       - name: Upload Installers with Tag
-        uses: softprops/action-gh-release@v1        
+        uses: ncipollo/release-action@v1        
         if: startsWith(github.ref, 'refs/tags/')
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
-          body: ${{ github.event.head_commit.message }}
-          files: |
+          token: ${{ secrets.GITHUB_TOKEN }}
+          generateReleaseNotes: true
+          artifacts: |
             msys2-*
diff --git a/make-msys2-installer b/make-msys2-installer
@@ -6,7 +6,7 @@ _spinal_version="$2"
 _scala_version="$1"
 _yosys_major_version="0.31"
 _verilator_version="4.228-1"
-_sbt_version="1.6.0"
+_sbt_version="1.8.0"
 _java_version="17.0.8.1-tem"
 
 _srcdir="$(pwd)"
@@ -92,8 +92,8 @@ install_sdkman(){
 
   sdk install java $_java_version
   sdk install sbt $_sbt_version
-  export SBT_OPTS="-Dsbt.version=1.8.0 -Dsbt.boot.directory=${_newmsys}/cache/.sbt/boot -Dsbt.global.base=${_newmsys}/cache/.sbt/1.0 -Dsbt.ivy.home=${_newmsys}/cache/.ivy2"
-  echo "export SBT_OPTS=\"-Dsbt.version=1.8.0 -Dsbt.boot.directory=/cache/.sbt/boot -Dsbt.global.base=/cache/.sbt/1.0 -Dsbt.ivy.home=/cache/.ivy2\"" >> ${_newmsys}/etc/skel/.bashrc
+  export SBT_OPTS="-Dsbt.version=${_sbt_version} -Dsbt.boot.directory=${_newmsys}/cache/.sbt/boot -Dsbt.global.base=${_newmsys}/cache/.sbt/1.0 -Dsbt.ivy.home=${_newmsys}/cache/.ivy2"
+  echo "export SBT_OPTS=\"-Dsbt.version=${_sbt_version} -Dsbt.boot.directory=/cache/.sbt/boot -Dsbt.global.base=/cache/.sbt/1.0 -Dsbt.ivy.home=/cache/.ivy2\"" >> ${_newmsys}/etc/skel/.bashrc
 }
 
 install_dependencies(){
@@ -117,7 +117,8 @@ install_coursier(){
 
 setup_sbt(){
   ${COURSIER} install scala:2.12.17
-  ${COURSIER} fetch org.scala-sbt:compiler-bridge_${_scala_version}:1.8.0
+  ${COURSIER} fetch org.scala-sbt:sbt:${_sbt_version}
+  ${COURSIER} fetch --sources org.scala-sbt:compiler-bridge_${_scala_version}:1.8.0
   ${COURSIER} fetch jline:jline:2.14.6
   ${COURSIER} fetch jline:jline:2.14.3
   ${COURSIER} fetch --sbt-plugin org.scalameta:sbt-scalafmt:2.4.6