diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e766d712..5c33f3b5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -317,7 +317,7 @@ release: - build:x86:rpm script: - export PACKAGE_VERSION_SEM=`head -n1 VERSION` - - export PACKAGE_VERSION=${PACKAGE_VERSION//-/_} + - export PACKAGE_VERSION=${PACKAGE_VERSION_SEM//-/_} - export PACKAGE_REGISTRY_URL="${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/jungfraujoch/${PACKAGE_VERSION_SEM}" - 'curl --header "JOB-TOKEN: $CI_JOB_TOKEN" --upload-file jfjoch-driver-dkms-${PACKAGE_VERSION}-1.el8.noarch.rpm "${PACKAGE_REGISTRY_URL}/jfjoch-driver-dkms-${PACKAGE_VERSION}-1.el8.noarch.rpm"' - 'curl --header "JOB-TOKEN: $CI_JOB_TOKEN" --upload-file jfjoch-writer-${PACKAGE_VERSION}-1.el8.x86_64.rpm "${PACKAGE_REGISTRY_URL}/jfjoch-writer-${PACKAGE_VERSION}-1.el8.x86_64.rpm"' diff --git a/fpga/scripts/synth_and_impl.tcl b/fpga/scripts/synth_and_impl.tcl index b88e5de3..c3b2553f 100644 --- a/fpga/scripts/synth_and_impl.tcl +++ b/fpga/scripts/synth_and_impl.tcl @@ -92,7 +92,7 @@ if {$WNSPLACE > -0.3000} { puts " ***** Final WNS: $WNSROUTE ps *****" puts "" - if {$WNSROUTE >= -0.050} { + if {$WNSROUTE >= 0} { write_bitstream -force -file ${bitstream_name} >> bitstream.log if {$part eq {xcu55c-fsvh2892-2L-e}} { write_cfgmem -force -size 128 -format mcs -interface SPIx4 -loadbit "up 0x01002000 ${bitstream_name}.bit" ${bitstream_name} >> cfgmem.log