From f10c2733783aa581f26d91339ccb87fef24385d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Malte=20J=C3=BCrgens?= Date: Sat, 14 Jan 2023 16:37:19 +0100 Subject: [PATCH] Replace Fedora 35 with Fedora 37 --- .gitlab-ci.yml | 16 ++++++++-------- Makefile | 32 +++++++++++++------------------- README.md | 2 +- assets/linux.Dockerfile | 2 +- 4 files changed, 23 insertions(+), 29 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a366d5f..fef17c7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -23,7 +23,7 @@ Build Docker Images: - ubuntu22 - mint20 - mint21 - - fedora35 + - fedora37 - fedora36 - macos-x86_64 - macos-aarch64 @@ -45,7 +45,7 @@ Build: - ubuntu22 - mint20 - mint21 - - fedora35 + - fedora37 - fedora36 - macos-x86_64 - macos-aarch64 @@ -106,8 +106,8 @@ Release: upload_package librewolf-$FILEVER.en-US.mint20.x86_64.deb.sha256sum upload_package librewolf-$FILEVER.en-US.mint21.x86_64.deb upload_package librewolf-$FILEVER.en-US.mint21.x86_64.deb.sha256sum - upload_package librewolf-$FILEVER.fc35.x86_64.rpm - upload_package librewolf-$FILEVER.fc35.x86_64.rpm.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.en-US.mac.x86_64.dmg @@ -149,12 +149,12 @@ Release: - name: Linux Mint 21 (sha256sum) link_type: other url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.en-US.mint21.x86_64.deb.sha256sum - - name: Fedora 35 (rpm) + - name: Fedora 37 (rpm) link_type: package - url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.fc35.x86_64.rpm - - name: Fedora 35 (sha256sum) + url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.fc37.x86_64.rpm + - name: Fedora 37 (sha256sum) link_type: other - url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.fc35.x86_64.rpm.sha256sum + url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.fc37.x86_64.rpm.sha256sum - name: Fedora 36 (rpm) link_type: package url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.fc36.x86_64.rpm diff --git a/Makefile b/Makefile index 142f471..65bb7da 100644 --- a/Makefile +++ b/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-fedora34 fedora34 docker-fedora35 fedora35 docker-fedora36 fedora36 docker-macos-x86_64 macos-x86_64 docker-macos-aarch64 macos-aarch64 docker-tumbleweed tumbleweed tarball docker-dind +.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 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-fedora34], [docker-fedora35], [docker-fedora36]" + @echo " [docker-fedora37], [docker-fedora36]" @echo " [docker-macos-x86_64], [docker-macos-aarch64]" @echo " [docker-tumbleweed]" @echo " [docker-dind]" @@ -23,7 +23,7 @@ help : @echo "build targets:" @echo " [debian11], [mint20], [mint21], [ubuntu20], [ubuntu21]" @echo " [ubuntu22]" - @echo " [fedora34], [fedora35], [fedora36]" + @echo " [fedora37], [fedora36]" @echo " [macos-x64_64], [macos-aarch64]" @echo " [tumbleweed]" @echo " [tarball]" @@ -42,7 +42,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-fedora35 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-fedora36 docker-tumbleweed docker-macos-x86_64 docker-macos-aarch64 docker-dind build : ${MAKE} clean @@ -60,7 +60,7 @@ build : ${MAKE} clean ${MAKE} fedora34 ${MAKE} clean - ${MAKE} fedora35 + ${MAKE} fedora37 ${MAKE} clean ${MAKE} fedora36 ${MAKE} clean @@ -79,7 +79,7 @@ push : docker push registry.gitlab.com/librewolf-community/browser/bsys5/ubuntu21 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/fedora35 + 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/tumbleweed docker push registry.gitlab.com/librewolf-community/browser/bsys5/macos-x86_64 @@ -94,7 +94,7 @@ rmi : docker rmi registry.gitlab.com/librewolf-community/browser/bsys5/ubuntu21 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/fedora35 + 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/tumbleweed docker rmi registry.gitlab.com/librewolf-community/browser/bsys5/macos-x86_64 @@ -168,18 +168,12 @@ docker-ubuntu22 : ubuntu22 : ${MAKE} -f assets/linux.mk distro=ubuntu22 build ${MAKE} -f assets/linux.artifacts.mk distro=ubuntu22 artifacts-deb -## fedora34 -docker-fedora34 : - ${MAKE} -f assets/linux.mk distro=fedora34 "distro_image=fedora:34" docker -fedora34 : - ${MAKE} -f assets/linux.mk distro=fedora34 build - ${MAKE} -f assets/linux.artifacts.mk fc=fc34 distro=fedora34 artifacts-rpm -## fedora35 -docker-fedora35 : - ${MAKE} -f assets/linux.mk distro=fedora35 "distro_image=fedora:35" docker -fedora35 : - ${MAKE} -f assets/linux.mk distro=fedora35 build - ${MAKE} -f assets/linux.artifacts.mk fc=fc35 distro=fedora35 artifacts-rpm +## fedora37 +docker-fedora37 : + ${MAKE} -f assets/linux.mk distro=fedora37 "distro_image=fedora:37" docker +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 diff --git a/README.md b/README.md index a003fcd..4065e7b 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ scripts. | └─ Debian (deb) | ✅ (debian11) | - | | └─ Ubuntu (deb) | ✅ (ubuntu20, ubuntu22) | - | | └─ Mint (deb) | ✅ (mint20, mint21) | - | -| └─ Fedora (rpm) | ✅ (fedora35, fedora36) | - | +| └─ Fedora (rpm) | ✅ (fedora36, fedora37) | - | | └─ openSUSE (rpm) | ✅ (tumbleweed) | - | | MacOS (dmg) | ✅ (macos-x64_64) | ✅ (macos-aarch64) | | Windows | _WIP_ | - | diff --git a/assets/linux.Dockerfile b/assets/linux.Dockerfile index fd8de85..252611b 100644 --- a/assets/linux.Dockerfile +++ b/assets/linux.Dockerfile @@ -15,7 +15,7 @@ ENV TZ=Europe/Amsterdam # dependencies needed to run ./mach bootstrap RUN ( apt-get -y update && apt-get -y upgrade && apt-get -y install python3 python3-dev python3-pip wget dpkg-sig ; true) -RUN ( dnf -y upgrade && dnf -y install python3 python3-devel wget rpm-build rpm-sign ; true) +RUN ( dnf -y upgrade && dnf -y install python3 python3-devel gcc wget rpm-build rpm-sign ; true) RUN ( zypper -n in mercurial python3 python3-pip python3-devel wget rpm-build ; true) # run the bootstrap