Skip to content

Commit 6021632

Browse files
authored
Merge pull request #147 from lebarsfa/PR-focal-ventura-eol
Ubuntu 20.04 and macOS Ventura EOL
2 parents 544e792 + 5d8bd52 commit 6021632

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

.github/workflows/dockermatrix.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
on:
22
push:
3-
branches: '**'
3+
branches: ['**']
44
# branches: 'master'
55
# branches: 'devel'
6-
tags: '' # Restrict to blank tags
6+
tags-ignore: ['**'] # Ignore all tag pushes
77
pull_request:
88
# branches: 'devel'
99

@@ -22,7 +22,9 @@ jobs:
2222
#
2323
#- { img: 'lebarsfa/pi-64:focal-for-codac', shell: bash, arch: arm64, bitness: 64, runtime: focal, desc: 'Ubuntu 20.04 arm64' }
2424
#- { img: 'arm64v8/ubuntu:focal', shell: bash, arch: arm64, bitness: 64, runtime: focal, docker_flags: '--platform linux/arm64', desc: 'Ubuntu 20.04 arm64' }
25-
- { img: 'amd64/ubuntu:focal', shell: bash, arch: amd64, bitness: 64, runtime: focal, docker_flags: '--platform linux/amd64', desc: 'Ubuntu 20.04 amd64' }
25+
#- { img: 'amd64/ubuntu:focal', shell: bash, arch: amd64, bitness: 64, runtime: focal, docker_flags: '--platform linux/amd64', desc: 'Ubuntu 20.04 amd64' }
26+
#- { img: 'arm64v8/ubuntu:jammy', shell: bash, arch: arm64, bitness: 64, runtime: jammy, docker_flags: '--platform linux/arm64', desc: 'Ubuntu 22.04 arm64' }
27+
- { img: 'amd64/ubuntu:jammy', shell: bash, arch: amd64, bitness: 64, runtime: jammy, docker_flags: '--platform linux/amd64', desc: 'Ubuntu 22.04 amd64' }
2628
name: ${{ matrix.cfg.desc }}
2729
steps:
2830
- uses: actions/checkout@v4

.github/workflows/unixmatrix.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
on:
22
push:
3-
branches: '**'
3+
branches: ['**']
44
# branches: 'master'
5-
tags: '' # Restrict to blank tags
5+
tags-ignore: ['**'] # Ignore all tag pushes
66
pull_request:
77

88
jobs:
@@ -38,7 +38,7 @@ jobs:
3838
# Current workaround is to use Intel app with Rosetta...
3939
#
4040
#- { os: macos-14, shell: bash, arch: arm64, bitness: 64, runtime: sonoma, desc: 'macOS Sonoma arm64' }
41-
- { os: macos-13, shell: bash, arch: x86_64, bitness: 64, runtime: ventura, desc: 'macOS Ventura x86_64' }
41+
- { os: macos-15-intel, shell: bash, arch: x86_64, bitness: 64, runtime: sonoma, desc: 'macOS Sonoma x86_64' } # Not clear whether it is more Sequoia or Sonoma, see https://github.com/actions/runner-images/issues/13045...
4242
name: ${{ matrix.cfg.desc }}
4343
steps:
4444
- uses: actions/checkout@v4

0 commit comments

Comments
 (0)