diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 849b7e7..00b6f7c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -46,11 +46,11 @@ Build: - fedora36 - macos-x86_64 - macos-aarch64 - - windows # For Windows, we wanted to use $DISTRO here, but that didn't work # remove this note once finishing it. # image: registry.gitlab.com/librewolf-community/browser/bsys5/$DISTRO + image: registry.gitlab.com/librewolf-community/browser/bsys5/dind tags: - autoscale @@ -70,12 +70,33 @@ Build: - librewolf-*.rpm.sha256sum - librewolf-*.dmg - librewolf-*.dmg.sha256sum + reports: + dotenv: variables.env + +# We do windows seperately for the moment, even tho +# the only real difference is the use of the docker image. + +BuildWindows: + stage: build + when: manual + allow_failure: false + image: registry.gitlab.com/librewolf-community/browser/bsys5/windows + tags: + - autoscale + script: + - make windows # was: make $DISTRO + - echo VERSION=$(cat version) >> variables.env + - echo RELEASE=$(cat release) >> variables.env + - echo SOURCE_RELEASE=$(cat source_release) >> variables.env + - "t=$(cat version)-$(cat source_release) ; grep 1 release ; if [ ! $? ]; then t=$(cat version)-$(cat source_release)-$(cat release); fi; echo FILEVER=$t >> variables.env" + artifacts: + paths: - librewolf-*-setup.exe - librewolf-*-setup.exe.sha256sum - librewolf-*-portable.zip - librewolf-*-portable.zip.sha256sum - reports: - dotenv: variables.env + + Release: stage: release