Merge pull request #334 from slaclab/pre-release

Release Candidate 4.17.1
slaclab · Dec 3, 2024 · 6932e70 · 6932e70
2 parents 918ae75 + 19614bd
commit 6932e70
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/.github/workflows/conda_build_lib.yml b/.github/workflows/conda_build_lib.yml
@@ -65,8 +65,8 @@ jobs:
           CONDA_UPLOAD_TOKEN_TAG: ${{ secrets.CONDA_UPLOAD_TOKEN_TAG }}
           OS_NAME: ${{ matrix.os }}
         run: |
-          echo ::set-output name=token::$CONDA_UPLOAD_TOKEN_TAG
-          echo ::set-output name=os::linux-64
+          echo "token=$CONDA_UPLOAD_TOKEN_TAG" >> $GITHUB_OUTPUT
+          echo "os=linux-64" >> $GITHUB_OUTPUT
 
       - name: Build
         run: |

diff --git a/.github/workflows/conda_build_proj.yml b/.github/workflows/conda_build_proj.yml
@@ -69,10 +69,10 @@ jobs:
           CONDA_UPLOAD_TOKEN_TAG: ${{ secrets.CONDA_UPLOAD_TOKEN_TAG }}
           URL_BASE: https://github.com/${{ github.repository }}/releases/download
         run: |
-          echo ::set-output name=token::$CONDA_UPLOAD_TOKEN_TAG
-          echo ::set-output name=url::${URL_BASE}/${GITHUB_REF#refs/tags/}/rogue_${GITHUB_REF#refs/tags/}.zip
-          echo ::set-output name=tag::${GITHUB_REF#refs/tags/}
-          echo ::set-output name=file::rogue_${GITHUB_REF#refs/tags/}.zip
+          echo "token=$CONDA_UPLOAD_TOKEN_TAG" >> $GITHUB_OUTPUT
+          echo "url=${URL_BASE}/${GITHUB_REF#refs/tags/}/rogue_${GITHUB_REF#refs/tags/}.zip" >> $GITHUB_OUTPUT
+          echo "tag=${GITHUB_REF#refs/tags/}" >> $GITHUB_OUTPUT
+          echo "file=rogue_${GITHUB_REF#refs/tags/}.zip" >> $GITHUB_OUTPUT
 
       - name: Download And Extract
         env:

diff --git a/.github/workflows/conda_build_win.yml b/.github/workflows/conda_build_win.yml
@@ -47,7 +47,7 @@ jobs:
       - name: Get Image Information
         id: get_image_info
         run: |
-          echo ::set-output name=tag::`git describe --tags`
+          echo "tag=$(git describe --tags)" >> $GITHUB_OUTPUT
 
       - name: Build And Upload
         env:

diff --git a/system_vivado.mk b/system_vivado.mk
@@ -89,7 +89,7 @@ export RECONFIG_CHECKPOINT = 0
 export RECONFIG_STATIC_HASH = 0
 else
 export RECONFIG_STATIC_FILE = $(notdir $(RECONFIG_CHECKPOINT))
-export RECONFIG_STATIC_HASH = -$(shell echo '$(RECONFIG_STATIC_FILE)' | awk -F'-' '{print $$5}' )
+export RECONFIG_STATIC_HASH = $(shell echo '$(RECONFIG_STATIC_FILE)' | awk -F'-' '{print $$5}' )
 endif
 
 ifndef RECONFIG_ENDPOINT

diff --git a/vivado/proc/project_management.tcl b/vivado/proc/project_management.tcl
@@ -32,7 +32,7 @@ proc CheckVivadoVersion { } {
       return -code error
    }
    # Check if version is newer than what official been tested
-   if { [VersionCompare 2024.1.0] > 0 } {
+   if { [VersionCompare 2024.2.0] > 0 } {
       puts "\n\n\n\n\n********************************************************"
       puts "ruckus has NOT been regression tested with this Vivado $::env(VIVADO_VERSION) release yet"
       puts "https://confluence.slac.stanford.edu/x/n4-jCg"