diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 90bc7c9edaf6cff8ea8046204bda453848beb8b8..ec641795ffdf77bbb88db10304ad34ccd472c41a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -55,23 +55,23 @@ linux-package: - cd packages - ./linux.sh -windows-package: - stage: package - tags: - - release - - wine - needs: - - job: build-lang - artifacts: true - # rules: - # - if: $CI_COMMIT_BRANCH == 'master' || $CI_COMMIT_TAG - # when: never - artifacts: - paths: - - packages/pamhyr-win-amd64.exe - script: - - cd packages - - ./windows.bat +# windows-package: +# stage: package +# tags: +# - release +# - wine +# needs: +# - job: build-lang +# artifacts: true +# # rules: +# # - if: $CI_COMMIT_BRANCH == 'master' || $CI_COMMIT_TAG +# # when: never +# artifacts: +# paths: +# - packages/pamhyr-win-amd64.exe +# script: +# - cd packages +# - ./windows.bat ########### # RELEASE # @@ -85,13 +85,14 @@ tag-release: needs: - job: linux-package artifacts: true - - job: windows-package - artifacts: true + # - job: windows-package + # artifacts: true rules: - if: $CI_COMMIT_TAG artifacts: paths: - packages/pamhyr-gnulinux-amd64.tar.xz + - packages/pamhyr-win-amd64.exe script: - cd packages # - ./linux.sh @@ -107,11 +108,7 @@ tag-release: url: '${CI_PROJECT_URL}/-/jobs/${CI_JOB_ID}/artifacts/raw/packages/pamhyr-gnulinux-amd64.tar.xz' filepath: '/packages/pamhyr-gnulinux-amd64.tar.xz' link_type: 'other' - # - name: 'Windows amd64 (zip)' - # url: '${CI_PROJECT_URL}/-/jobs/${CI_JOB_ID}/artifacts/raw/packages/pamhyr-win-amd64.zip' - # filepath: '/packages/pamhyr-win-amd64.zip' - # link_type: 'Packages' - - name: 'Windows amd64 (exe)' - url: '${CI_PROJECT_URL}/-/jobs/${CI_JOB_ID}/artifacts/raw/packages/pamhyr-win-amd64.exe' - filepath: '/packages/pamhyr-win-amd64.exe' - link_type: 'other' + # - name: 'Windows amd64 (exe)' + # url: '${CI_PROJECT_URL}/-/jobs/${CI_JOB_ID}/artifacts/raw/packages/pamhyr-win-amd64.exe' + # filepath: '/packages/pamhyr-win-amd64.exe' + # link_type: 'other'