diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4de491dbed61868b587ed03e3f27d1fd7307488c..55cb70ab7e9197aa06fd109a7359699759d3fbf9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -48,22 +48,22 @@ linux-package: - cd packages - ./linux.sh -windows-package: - stage: release - tags: - - release - - wine - rules: - - if: $CI_COMMIT_BRANCH == 'master' - - if: $CI_COMMIT_TAG - when: never - artifacts: - paths: - - packages/pamhyr-win-amd64.zip - - packages/pamhyr-win-amd64.exe - script: - - cd packages - - ./wine.sh ci +# windows-package: +# stage: release +# tags: +# - release +# - wine +# rules: +# - if: $CI_COMMIT_BRANCH == 'master' +# - if: $CI_COMMIT_TAG +# when: never +# artifacts: +# paths: +# - packages/pamhyr-win-amd64.zip +# - packages/pamhyr-win-amd64.exe +# script: +# - cd packages +# - ./wine.sh ci tag-release: stage: release @@ -76,12 +76,12 @@ tag-release: artifacts: paths: - packages/pamhyr-gnulinux-amd64.tar.xz - - packages/pamhyr-win-amd64.zip - - packages/pamhyr-win-amd64.exe + # - packages/pamhyr-win-amd64.zip + # - packages/pamhyr-win-amd64.exe script: - cd packages - ./linux.sh - - ./wine.sh ci + # - ./wine.sh ci release: name: '$CI_COMMIT_TAG-release' description: 'Automatic release from tag $CI_COMMIT_TAG' @@ -92,12 +92,12 @@ tag-release: - name: 'GNU/Linux amd64 (tar.xz)' 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: 'Packages' - - 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: 'Packages' + 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: 'Packages' diff --git a/packages/wine.sh b/packages/wine.sh index 561716f74391a1fed1df25aa46b9986ea20c265a..1a769f515d699932bcfaf5d90dc88574510027af 100755 --- a/packages/wine.sh +++ b/packages/wine.sh @@ -6,7 +6,7 @@ export WINARCH=win64 if [ "$1" = "ci" ]; then - # HACK: Set wine prefix for gitlab-ci runner + # HACK: Set wine prefix for gitlab-ci runner (DONT WORKS) cp -rfv /home/parouby/git/pamhyr/packages/wine-pamhyr-build $PWD/wine-pamhyr-build chown $USER -R $PWD/wine-pamhyr-build chmod 755 $PWD/wine-pamhyr-build