Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release Candidate 4.17.1 #334

Merged
merged 4 commits into from
Dec 3, 2024
Merged

Release Candidate 4.17.1 #334

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
539b17e
bug fix for DXF IMAGENAME
ruck314 Nov 20, 2024
cb8a0d3
bug fix for DXF IMAGENAME
ruck314 Nov 20, 2024
a8b52cc
Update project_management.tcl for Vivado 2024.2
ruck314 Nov 20, 2024
19614bd
::set-output command is deprecated and upgrading to new method
ruck314 Dec 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/conda_build_lib.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/conda_build_proj.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/conda_build_win.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion system_vivado.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion vivado/proc/project_management.tcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down