librewolf-bot/bsys5
1
0
Fork 0
Code Issues 7 Pull requests Projects Releases Packages Wiki Activity

testing

Browse source
This commit is contained in:
Malte Jürgens 2022-05-09 21:12:18 +02:00
parent 1a52e7f6e4
commit 96d14c4c87
Signed by: maltejur
GPG key ID: D29FBD5F93C0CFC3
3 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
.gitlab-ci.yml
View file

@ -24,6 +24,8 @@ Build Docker Images:
- fedora35 - fedora35
- macos-x86_64 - macos-x86_64
- macos-aarch64 - macos-aarch64
variables:
DOCKER_HOST: tcp://docker:2375
# Install docker and make # Install docker and make
before_script: before_script:
- apt-get update - apt-get update
@ -34,9 +36,9 @@ Build Docker Images:
- apt-get install -y docker-ce docker-ce-cli containerd.io docker-compose-plugin make - apt-get install -y docker-ce docker-ce-cli containerd.io docker-compose-plugin make
# Build container # Build container
script: script:
- docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD registry.gitlab.com
- DOCKER_HOST="tcp://docker:2375" make docker-$DISTRO - make docker-$DISTRO
- docker push $CI_REGISTRY/librewolf-community/browser/bsys5/$DISTRO:latest - docker push registry.gitlab.com/librewolf-community/browser/bsys5/$DISTRO:latest
Build: Build:
stage: build stage: build

2
assets/linux.mk
View file

@ -12,7 +12,7 @@ full_version:=$(version)-$(source_release)$(shell [ $(release) -gt 1 ] && echo "
outfile=librewolf-$(full_version).en-US.$(distro)-x86_64.tar.bz2 outfile=librewolf-$(full_version).en-US.$(distro)-x86_64.tar.bz2
docker : docker :
docker build --build-arg "distro=$(distro_image)" --build-arg "version=$(version)" --build-arg "source_release=$(source_release)" -t $(CI_REGISTRY)/librewolf-community/browser/bsys5/$(distro):latest - < assets/linux.Dockerfile docker build --build-arg "distro=$(distro_image)" --build-arg "version=$(version)" --build-arg "source_release=$(source_release)" -t registry.gitlab.com/librewolf-community/browser/bsys5/$(distro):latest - < assets/linux.Dockerfile
build : $(outfile) $(outfile).sha256sum build : $(outfile) $(outfile).sha256sum

2
assets/macos.mk
View file

@ -11,7 +11,7 @@ full_version:=$(version)-$(source_release)$(shell [ $(release) -gt 1 ] && echo "
outfile=librewolf-$(full_version).en-US.mac.$(arch).dmg outfile=librewolf-$(full_version).en-US.mac.$(arch).dmg
docker : docker :
docker build --build-arg "arch=$(arch)" --build-arg "version=$(version)" --build-arg "source_release=$(source_release)" -t $(CI_REGISTRY)/librewolf-community/browser/bsys5/macos:$(arch) - < assets/macos.Dockerfile docker build --build-arg "arch=$(arch)" --build-arg "version=$(version)" --build-arg "source_release=$(source_release)" -t registry.gitlab.com/librewolf-community/browser/bsys5/macos:$(arch) - < assets/macos.Dockerfile
build : $(outfile) $(outfile).sha256sum build : $(outfile) $(outfile).sha256sum