diff options
| author | Gerd Hoffmann <kraxel@redhat.com> | 2020-11-06 11:38:13 +0100 |
|---|---|---|
| committer | Gerd Hoffmann <kraxel@redhat.com> | 2020-11-06 11:38:13 +0100 |
| commit | 6a289bfe493cc5d97778c4ff13afa11ff28e017c (patch) | |
| tree | 7ce719009f7c6681fa02a8a809d4ac087b765bee | |
| parent | f662ba096ef1cdc4e469482ab52f9154d862cd9e (diff) | |
| download | imagefish-6a289bfe493cc5d97778c4ff13afa11ff28e017c.tar.gz | |
ci: add wsl, reorganize
| -rw-r--r-- | .gitlab-ci.yml | 49 |
1 files changed, 31 insertions, 18 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5f236fa..a6acb73 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -6,24 +6,26 @@ variables: DEPS: "/usr/bin/guestfish xz sudo" .store_images: &store_images - - xz --verbose *.qcow2 + - xz --verbose $(ls *.tar *.qcow2) - mkdir $CI_JOB_NAME - - mv --verbose *.qcow2.xz $CI_JOB_NAME - - tree -s -h --charset utf8 -T "$CI_JOB_NAME images" -H "$CI_JOB_URL/artifacts/raw/$CI_JOB_NAME" $CI_JOB_NAME > index.html + - mv --verbose *.xz $CI_JOB_NAME + - name="$CI_JOB_NAME images" + - base="$CI_JOB_URL/artifacts/raw/$CI_JOB_NAME" + - tree -s -h --charset utf8 -T "$name" -H "$base" $CI_JOB_NAME > index.html - mv --verbose index.html $CI_JOB_NAME -fedora: +centos7: stage: images - image: registry.gitlab.com/kraxel/rpm-package-builder:fedora + image: registry.gitlab.com/kraxel/rpm-package-builder:centos7 before_script: - - time dnf install -y $DEPS + - time yum install -y $DEPS script: - - time ./Fedora-efi-grub2.sh - - time ./Fedora-efi-systemd.sh + - sed -i -e '/proxy/d' repos/centos-7.repo + - time ./CentOS7-efi.sh - *store_images artifacts: paths: - - fedora + - centos7 centos8: stage: images @@ -38,29 +40,40 @@ centos8: paths: - centos8 -centos7: +fedora: stage: images - image: registry.gitlab.com/kraxel/rpm-package-builder:centos7 + image: registry.gitlab.com/kraxel/rpm-package-builder:fedora before_script: - - time yum install -y $DEPS + - time dnf install -y $DEPS script: - - sed -i -e '/proxy/d' repos/centos-7.repo - - time ./CentOS7-efi.sh + - time ./Fedora-efi-grub2.sh + - time ./Fedora-efi-systemd.sh - *store_images artifacts: paths: - - centos7 + - fedora + +wsl: + stage: images + image: registry.gitlab.com/kraxel/rpm-package-builder:fedora + script: + - time ./Fedora-wsl.sh + - *store_images + artifacts: + paths: + - wsl pages: stage: publish image: registry.gitlab.com/kraxel/rpm-package-builder:fedora dependencies: - - fedora - - centos8 - centos7 + - centos8 + - fedora + - wsl script: - mkdir public - - for d in fedora centos8 centos7; do mv -v ${d}/index.html public/${d}.html; done + - for d in centos7 centos8 fedora wsl; do mv -v ${d}/index.html public/${d}.html; done - tree --charset utf8 -T "images" -H . public > index.html - mv -v index.html public artifacts: |