Skip to content
This repository has been archived by the owner on Oct 15, 2024. It is now read-only.

Commit

Permalink
Merge pull request #4068 from mpranj/fedora-arm64
Browse files Browse the repository at this point in the history
cirrus: use greedy instances
  • Loading branch information
mpranj authored Sep 26, 2021
2 parents 6c82a88 + defca65 commit 817f7eb
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 7 deletions.
19 changes: 12 additions & 7 deletions .cirrus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@ env:
BUILD_DIR: build

container:
memory: 12
cpu: 5
greedy: true

# We store common commands here, so we can reference them in the build jobs below.
commands:
Expand All @@ -30,19 +29,19 @@ task:
- name: 😈 FreeBSD 12
freebsd_instance:
cpu: 4
memory: 8
memory: 8G
image_family: freebsd-12-2

- name: 😈 FreeBSD 13
freebsd_instance:
cpu: 4
memory: 8
memory: 8G
image_family: freebsd-13-0

- name: 😈 ASAN
freebsd_instance:
cpu: 4
memory: 8
cpu: 8
memory: 8G
image_family: freebsd-13-0
env:
ENABLE_ASAN: ON
Expand Down Expand Up @@ -211,8 +210,10 @@ task:
task:
matrix:

- name: 🐧 Fedora
- name: 🐧 Fedora amd64
container:
cpu: 8
memory: 16G
dockerfile: scripts/docker/cirrus/fedora/Dockerfile

script:
Expand Down Expand Up @@ -243,6 +244,8 @@ task:

- name: 🔗 Check
container:
cpu: 2
memory: 4G
dockerfile: scripts/docker/cirrus/arch/Dockerfile

clone_script: |
Expand Down Expand Up @@ -284,6 +287,8 @@ task:

- name: 📚 Check
container:
cpu: 6
memory: 8G
dockerfile: scripts/docker/cirrus/arch/Dockerfile

script:
Expand Down
1 change: 1 addition & 0 deletions doc/news/_preparation_next_release.md
Original file line number Diff line number Diff line change
Expand Up @@ -288,6 +288,7 @@ _(Michael Tucek)_
- Migrate most macOS build jobs to GitHub actions to speed up builds. _(Mihael Pranjić)_
- Bump FreeBSD images to 12.2 and 13.0 using the LLVM 12 toolchain, drop FreeBSD 11. _(Mihael Pranjić)_
- Fix cirrus-file parsing errors. _(Mihael Pranjić)_
- Redistribute CPU and memory resources and enable greedy instances. _(Mihael Pranjić)_

### GitHub Actions

Expand Down
2 changes: 2 additions & 0 deletions tests/linkchecker.whitelist
Original file line number Diff line number Diff line change
Expand Up @@ -47,3 +47,5 @@ https://www.openicc.info/index.php%3Ftitle=OpenICC_Configuration_0.1.html
https://cfp.linuxwochen.at/de/LWW18/public/events/798
# wrongly detected as broken, even though its online
https://www.sciencedaily.com/releases/2005/11/051103080801.htm
https://www.samba.org/samba/docs/old/Samba3-HOWTO/SWAT.html
https://www.samba.org/samba/docs/current/man-html/smb.conf.5.html

0 comments on commit 817f7eb

Please sign in to comment.