diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4d54d878..e766d712 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -104,6 +104,7 @@ build:x86:rpm: - cd build - source /opt/rh/gcc-toolset-12/enable - cmake -DCMAKE_BUILD_TYPE=Release .. + - make update_version - make frontend - make -j48 package - mv *.rpm .. @@ -315,8 +316,8 @@ release: - build:x86:driver - build:x86:rpm script: - - export PACKAGE_VERSION=`head -n1 VERSION` - - export PACKAGE_VERSION_SEM=${PACKAGE_VERSION//_/-} + - export PACKAGE_VERSION_SEM=`head -n1 VERSION` + - export PACKAGE_VERSION=${PACKAGE_VERSION//-/_} - 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/CMakeLists.txt b/CMakeLists.txt index 52ff1e90..ce742bb2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -131,17 +131,17 @@ IF (NOT JFJOCH_WRITER_ONLY) WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/frontend_ui) ADD_CUSTOM_TARGET(frontend DEPENDS frontend_ui/build/index.html) - ADD_CUSTOM_TARGET(openapi - COMMAND bash update_openapi.sh + ADD_CUSTOM_TARGET(update_version + COMMAND bash update_version.sh WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}) INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/fpga/pcie_driver/ - DESTINATION /usr/src/jfjoch-1.0.0 + DESTINATION /usr/src/jfjoch-${JFJOCH_VERSION} COMPONENT driver-dkms FILES_MATCHING PATTERN "dkms.conf") INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/fpga/pcie_driver/ - DESTINATION /usr/src/jfjoch-1.0.0/src + DESTINATION /usr/src/jfjoch-${JFJOCH_VERSION}/src COMPONENT driver-dkms FILES_MATCHING PATTERN "*.c" PATTERN "*.h" PATTERN "Makefile") diff --git a/VERSION b/VERSION index c62cbe00..884b1ae5 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.0.0_rc.12 +1.0.0-rc.12 diff --git a/fpga/pcie_driver/dkms.conf b/fpga/pcie_driver/dkms.conf index fe9949ec..4b72621a 100644 --- a/fpga/pcie_driver/dkms.conf +++ b/fpga/pcie_driver/dkms.conf @@ -1,5 +1,5 @@ PACKAGE_NAME=jfjoch -PACKAGE_VERSION=1.0.0 +PACKAGE_VERSION=1.0.0-rc.12 DEST_MODULE_LOCATION=/extra BUILT_MODULE_NAME=jfjoch diff --git a/fpga/pcie_driver/jfjoch_drv.c b/fpga/pcie_driver/jfjoch_drv.c index c1ead92b..31d5a623 100644 --- a/fpga/pcie_driver/jfjoch_drv.c +++ b/fpga/pcie_driver/jfjoch_drv.c @@ -11,7 +11,7 @@ MODULE_AUTHOR("Filip Leonarski; Paul Scherrer Institute"); MODULE_DESCRIPTION("Jungfraujoch device module"); MODULE_LICENSE("GPL"); -MODULE_VERSION("1.0.0"); +MODULE_VERSION("1.0.0-rc.12"); #define XDMA_GEN4_x8 (0x9048) #define XDMA_GEN3_x16 (0x903F) diff --git a/fpga/pcie_driver/postinstall.sh b/fpga/pcie_driver/postinstall.sh index b6d9f2bc..746c2488 100644 --- a/fpga/pcie_driver/postinstall.sh +++ b/fpga/pcie_driver/postinstall.sh @@ -1,7 +1,7 @@ #!/bin/bash # Taken from https://schneide.blog/2015/08/10/packaging-kernel-modulesdrivers-using-dkms/ -VERSION="1.0.0" +VERSION=1.0.0-rc.12 occurrences=`/usr/sbin/dkms status | grep jfjoch | grep ${VERSION} | wc -l` diff --git a/fpga/pcie_driver/preuninstall.sh b/fpga/pcie_driver/preuninstall.sh index 9c3a6f4f..61f92f15 100644 --- a/fpga/pcie_driver/preuninstall.sh +++ b/fpga/pcie_driver/preuninstall.sh @@ -1,7 +1,7 @@ #!/bin/bash # Taken from https://schneide.blog/2015/08/10/packaging-kernel-modulesdrivers-using-dkms/ -VERSION="1.0.0" +VERSION=1.0.0-rc.12 /usr/sbin/dkms remove -m jfjoch -v ${VERSION} --all diff --git a/update_openapi.sh b/update_version.sh similarity index 68% rename from update_openapi.sh rename to update_version.sh index 0457c5d6..0d884d28 100644 --- a/update_openapi.sh +++ b/update_version.sh @@ -4,7 +4,7 @@ # Copyright (2019-2024) Paul Scherrer Institute # -#wget https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/7.2.0/openapi-generator-cli-7.2.0.jar -O openapi-generator-cli.jar +wget https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/7.2.0/openapi-generator-cli-7.2.0.jar -O openapi-generator-cli.jar VERSION=$(