add fedora38, remove fedora36
This commit is contained in:
parent
d8abb1279e
commit
5b6e193b9a
GPG key ID:
D29FBD5F93C0CFC3
3 changed files with 36 additions and 28 deletions
|
|
@ -20,14 +20,16 @@ Images:
|
|||
- mint20
|
||||
- mint21
|
||||
- fedora37
|
||||
- fedora36
|
||||
- fedora38
|
||||
- macos-x86_64
|
||||
- macos-aarch64
|
||||
- dind
|
||||
script:
|
||||
- docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD registry.gitlab.com
|
||||
- docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD
|
||||
registry.gitlab.com
|
||||
- make docker-$DISTRO
|
||||
- docker push registry.gitlab.com/librewolf-community/browser/bsys5/$DISTRO:latest
|
||||
- docker push
|
||||
registry.gitlab.com/librewolf-community/browser/bsys5/$DISTRO:latest
|
||||
|
||||
Build:
|
||||
stage: build
|
||||
|
|
@ -42,7 +44,7 @@ Build:
|
|||
- mint20
|
||||
- mint21
|
||||
- fedora37
|
||||
- fedora36
|
||||
- fedora38
|
||||
- macos-x86_64
|
||||
- macos-aarch64
|
||||
image: registry.gitlab.com/librewolf-community/browser/bsys5/dind
|
||||
|
|
@ -55,7 +57,9 @@ Build:
|
|||
- 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"
|
||||
- "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-*.deb
|
||||
|
|
@ -86,7 +90,8 @@ Release:
|
|||
before_script:
|
||||
- apt-get update
|
||||
- apt-get install -y curl
|
||||
- curl -L --output /usr/local/bin/release-cli "https://release-cli-downloads.s3.amazonaws.com/latest/release-cli-linux-amd64"
|
||||
- curl -L --output /usr/local/bin/release-cli
|
||||
"https://release-cli-downloads.s3.amazonaws.com/latest/release-cli-linux-amd64"
|
||||
- chmod +x /usr/local/bin/release-cli
|
||||
script:
|
||||
- |
|
||||
|
|
@ -113,8 +118,8 @@ Release:
|
|||
upload_package librewolf-$FILEVER.en-US.mint21.x86_64.deb.sha256sum
|
||||
upload_package librewolf-$FILEVER.fc37.x86_64.rpm
|
||||
upload_package librewolf-$FILEVER.fc37.x86_64.rpm.sha256sum
|
||||
upload_package librewolf-$FILEVER.fc36.x86_64.rpm
|
||||
upload_package librewolf-$FILEVER.fc36.x86_64.rpm.sha256sum
|
||||
upload_package librewolf-$FILEVER.fc38.x86_64.rpm
|
||||
upload_package librewolf-$FILEVER.fc38.x86_64.rpm.sha256sum
|
||||
upload_package librewolf-$FILEVER.en-US.mac.x86_64.dmg
|
||||
upload_package librewolf-$FILEVER.en-US.mac.x86_64.dmg.sha256sum
|
||||
upload_package librewolf-$FILEVER.en-US.mac.aarch64.dmg
|
||||
|
|
@ -162,7 +167,7 @@ Release:
|
|||
"file": "$CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.fc37.x86_64.rpm"
|
||||
},
|
||||
{
|
||||
"file": "$CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.fc36.x86_64.rpm"
|
||||
"file": "$CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.fc38.x86_64.rpm"
|
||||
}
|
||||
]
|
||||
}
|
||||
|
|
@ -174,7 +179,10 @@ Release:
|
|||
echo "Submitted update request to LibreWolf Software Repository (https://updaterepos.librewolf.net/job?id=$id)"
|
||||
release:
|
||||
tag_name: "$FILEVER"
|
||||
description: "## LibreWolf bsys5 Release v$FILEVER\n\n- \n\n(Built on GitLab by pipeline [$CI_PIPELINE_ID](https://gitlab.com/librewolf-community/browser/bsys5/-/pipelines/$CI_PIPELINE_ID))"
|
||||
description:
|
||||
"## LibreWolf bsys5 Release v$FILEVER\n\n- \n\n(Built on GitLab by
|
||||
pipeline
|
||||
[$CI_PIPELINE_ID](https://gitlab.com/librewolf-community/browser/bsys5/-/pipelines/$CI_PIPELINE_ID))"
|
||||
assets:
|
||||
links:
|
||||
- name: Debian 11 (deb)
|
||||
|
|
@ -213,12 +221,12 @@ Release:
|
|||
- name: Fedora 37 (sha256sum)
|
||||
link_type: other
|
||||
url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.fc37.x86_64.rpm.sha256sum
|
||||
- name: Fedora 36 (rpm)
|
||||
- name: Fedora 38 (rpm)
|
||||
link_type: package
|
||||
url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.fc36.x86_64.rpm
|
||||
- name: Fedora 36 (sha256sum)
|
||||
url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.fc38.x86_64.rpm
|
||||
- name: Fedora 38 (sha256sum)
|
||||
link_type: other
|
||||
url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.fc36.x86_64.rpm.sha256sum
|
||||
url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.fc38.x86_64.rpm.sha256sum
|
||||
- name: macOS x86_64 (dmg)
|
||||
link_type: package
|
||||
url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.en-US.mac.x86_64.dmg
|
||||
|
|
|
|||
26
Makefile
26
Makefile
|
|
@ -1,4 +1,4 @@
|
|||
.PHONY : help clean veryclean prune docker push rmi build update work docker-debian11 debian11 docker-mint20 mint20 docker-mint21 mint21 docker-ubuntu20 ubuntu20 docker-ubuntu21 ubuntu21 docker-ubuntu22 ubuntu22 docker-fedora37 fedora37 docker-fedora36 fedora36 docker-macos-x86_64 macos-x86_64 docker-macos-aarch64 macos-aarch64 docker-tumbleweed tumbleweed tarball docker-dind windows
|
||||
.PHONY : help clean veryclean prune docker push rmi build update work docker-debian11 debian11 docker-mint20 mint20 docker-mint21 mint21 docker-ubuntu20 ubuntu20 docker-ubuntu21 ubuntu21 docker-ubuntu22 ubuntu22 docker-fedora37 fedora37 docker-fedora38 fedora38 docker-macos-x86_64 macos-x86_64 docker-macos-aarch64 macos-aarch64 docker-tumbleweed tumbleweed tarball docker-dind windows
|
||||
|
||||
version:=$(shell cat version)
|
||||
release:=$(shell cat release)
|
||||
|
|
@ -15,7 +15,7 @@ help :
|
|||
@echo "docker targets:"
|
||||
@echo " [docker-debian11], [docker-mint20], [docker-mint21]"
|
||||
@echo " [docker-ubuntu20], [docker-ubuntu21], [docker-ubuntu22]"
|
||||
@echo " [docker-fedora37], [docker-fedora36]"
|
||||
@echo " [docker-fedora37], [docker-fedora38]"
|
||||
@echo " [docker-macos-x86_64], [docker-macos-aarch64]"
|
||||
@echo " [docker-tumbleweed]"
|
||||
@echo " [docker-dind]"
|
||||
|
|
@ -24,7 +24,7 @@ help :
|
|||
@echo "build targets:"
|
||||
@echo " [debian11], [mint20], [mint21], [ubuntu20], [ubuntu21]"
|
||||
@echo " [ubuntu22]"
|
||||
@echo " [fedora37], [fedora36]"
|
||||
@echo " [fedora37], [fedora38]"
|
||||
@echo " [macos-x64_64], [macos-aarch64]"
|
||||
@echo " [tumbleweed]"
|
||||
@echo " [windows]"
|
||||
|
|
@ -44,7 +44,7 @@ veryclean : clean
|
|||
prune :
|
||||
docker system prune --all --force
|
||||
|
||||
docker : docker-debian11 docker-mint20 docker-mint21 docker-ubuntu20 docker-ubuntu21 docker-ubuntu22 docker-fedora34 docker-fedora37 docker-fedora36 docker-tumbleweed docker-macos-x86_64 docker-macos-aarch64 docker-dind
|
||||
docker : docker-debian11 docker-mint20 docker-mint21 docker-ubuntu20 docker-ubuntu21 docker-ubuntu22 docker-fedora34 docker-fedora37 docker-fedora38 docker-tumbleweed docker-macos-x86_64 docker-macos-aarch64 docker-dind
|
||||
|
||||
build :
|
||||
${MAKE} clean
|
||||
|
|
@ -64,7 +64,7 @@ build :
|
|||
${MAKE} clean
|
||||
${MAKE} fedora37
|
||||
${MAKE} clean
|
||||
${MAKE} fedora36
|
||||
${MAKE} fedora38
|
||||
${MAKE} clean
|
||||
${MAKE} tumbleweed
|
||||
${MAKE} clean
|
||||
|
|
@ -84,7 +84,7 @@ push :
|
|||
docker push registry.gitlab.com/librewolf-community/browser/bsys5/ubuntu22
|
||||
docker push registry.gitlab.com/librewolf-community/browser/bsys5/fedora34
|
||||
docker push registry.gitlab.com/librewolf-community/browser/bsys5/fedora37
|
||||
docker push registry.gitlab.com/librewolf-community/browser/bsys5/fedora36
|
||||
docker push registry.gitlab.com/librewolf-community/browser/bsys5/fedora38
|
||||
docker push registry.gitlab.com/librewolf-community/browser/bsys5/tumbleweed
|
||||
docker push registry.gitlab.com/librewolf-community/browser/bsys5/macos-x86_64
|
||||
docker push registry.gitlab.com/librewolf-community/browser/bsys5/macos-aarch64
|
||||
|
|
@ -99,7 +99,7 @@ rmi :
|
|||
docker rmi registry.gitlab.com/librewolf-community/browser/bsys5/ubuntu22
|
||||
docker rmi registry.gitlab.com/librewolf-community/browser/bsys5/fedora34
|
||||
docker rmi registry.gitlab.com/librewolf-community/browser/bsys5/fedora37
|
||||
docker rmi registry.gitlab.com/librewolf-community/browser/bsys5/fedora36
|
||||
docker rmi registry.gitlab.com/librewolf-community/browser/bsys5/fedora38
|
||||
docker rmi registry.gitlab.com/librewolf-community/browser/bsys5/tumbleweed
|
||||
docker rmi registry.gitlab.com/librewolf-community/browser/bsys5/macos-x86_64
|
||||
docker rmi registry.gitlab.com/librewolf-community/browser/bsys5/macos-aarch64
|
||||
|
|
@ -178,12 +178,12 @@ docker-fedora37 :
|
|||
fedora37 :
|
||||
${MAKE} -f assets/linux.mk distro=fedora37 build
|
||||
${MAKE} -f assets/linux.artifacts.mk fc=fc37 distro=fedora37 artifacts-rpm
|
||||
## fedora36
|
||||
docker-fedora36 :
|
||||
${MAKE} -f assets/linux.mk distro=fedora36 "distro_image=fedora:36" docker
|
||||
fedora36 :
|
||||
${MAKE} -f assets/linux.mk distro=fedora36 build
|
||||
${MAKE} -f assets/linux.artifacts.mk fc=fc36 distro=fedora36 artifacts-rpm
|
||||
## fedora38
|
||||
docker-fedora38 :
|
||||
${MAKE} -f assets/linux.mk distro=fedora38 "distro_image=fedora:38" docker
|
||||
fedora38 :
|
||||
${MAKE} -f assets/linux.mk distro=fedora38 build
|
||||
${MAKE} -f assets/linux.artifacts.mk fc=fc38 distro=fedora38 artifacts-rpm
|
||||
## opensuse tumbleweed
|
||||
docker-tumbleweed :
|
||||
${MAKE} -f assets/linux.mk distro=tumbleweed "distro_image=opensuse/tumbleweed" docker
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ scripts.
|
|||
| └─ Debian (deb) | ✅ (debian11) | - |
|
||||
| └─ Ubuntu (deb) | ✅ (ubuntu20, ubuntu22) | - |
|
||||
| └─ Mint (deb) | ✅ (mint20, mint21) | - |
|
||||
| └─ Fedora (rpm) | ✅ (fedora36, fedora37) | - |
|
||||
| └─ Fedora (rpm) | ✅ (fedora38, fedora37) | - |
|
||||
| └─ openSUSE (rpm) | ✅ (tumbleweed) | - |
|
||||
| MacOS (dmg) | ✅ (macos-x64_64) | ✅ (macos-aarch64) |
|
||||
| Windows (setup,portable) | ✅ (windows) | - |
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue