diff --git a/.gitmodules b/.gitmodules index 89d1511b4497814393d2f22fa15f476f5ecb2fb8..bda2b24c434e8f7e0af7b45711373810e0c2c9bf 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,6 @@ [submodule "3rdparty/zxing-cpp"] - path = 3rdparty/zxing-cpp - url = https://github.com/zxing-cpp/zxing-cpp.git +path = 3rdparty/zxing-cpp +url = https://github.com/zxing-cpp/zxing-cpp.git [submodule "3rdparty/qtquickdesigner-components"] - path = 3rdparty/qtquickdesigner-components - url = https://codereview.qt-project.org/qt-labs/qtquickdesigner-components +path = 3rdparty/qtquickdesigner-components +url = https://codereview.qt-project.org/qt-labs/qtquickdesigner-components diff --git a/cicd/stages/release.yml b/cicd/stages/release.yml index 01a65cf10311fa89728e904726d57549e9cb084d..f68c7284ad505c7767c0ba8ce729ab81e048600c 100644 --- a/cicd/stages/release.yml +++ b/cicd/stages/release.yml @@ -17,16 +17,17 @@ create-packages: script: - apk add tar curl - echo ${QDS_CI_ARTIFACTS_PATH}; ls -l ${QDS_CI_ARTIFACTS_PATH} + - ls -l ${QDS_CI_ARTIFACTS_PATH}/* - cd ${QDS_CI_ARTIFACTS_PATH} - | for arch in $(ls); do - echo "Running for $platform-$arch. Compressing..." + echo "Running for ${arch}. Compressing..." # app folder contains the apk for the app # test folder contains the apk for the tests # we only need to compress the app folder - cd "$arch/app" - tar -czf "$platform-$arch.tar.gz" * - echo "Uploading $platform-$arch.tar.gz to GitLab Package Registry" + cd "${arch}/app" + tar -czf "${arch}.tar.gz" * + echo "Uploading ${arch}.tar.gz to GitLab Package Registry" curl --header "JOB-TOKEN: ${CI_JOB_TOKEN}" --upload-file "${platform}-${arch}.tar.gz" ${QDS_PACKAGE_URL}/qt-ui-viewer-${CI_COMMIT_TAG}-qt${QDS_CI_QT_VERSION}-${platform}-${arch}.tar.gz cd .. done