Skip to content

Commit

Permalink
Update Github Actions
Browse files Browse the repository at this point in the history
* Add debug and release builds for Ubuntu 24.04 LTS
* Remove builds for Fedora 37 and Fedora 38 because they are EOL
* Add debug and release builds for Fedora 40
* Update MacOS builds for MacOS 13 and MacOS 14. Note that Github's
  MacOS 14 runners are arm64, not x86_64.
  • Loading branch information
leonlynch committed May 23, 2024
1 parent 3fb732b commit 9b618a9
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 12 deletions.
6 changes: 2 additions & 4 deletions .github/workflows/fedora-build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,8 @@ jobs:
fail-fast: false
matrix:
include:
- { name: "Fedora 37", fedora_version: 37 }
- { name: "Fedora 38", fedora_version: 38 }
- { name: "Fedora 39", fedora_version: 39 }
- { name: "Fedora 40", fedora_version: 40 }

name: ${{ matrix.name }} build (static/debug)
runs-on: ubuntu-latest
Expand Down Expand Up @@ -55,9 +54,8 @@ jobs:
fail-fast: false
matrix:
include:
- { name: "Fedora 37", fedora_version: 37 }
- { name: "Fedora 38", fedora_version: 38 }
- { name: "Fedora 39", fedora_version: 39 }
- { name: "Fedora 40", fedora_version: 40 }

name: ${{ matrix.name }} release
runs-on: ubuntu-latest
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/macos-build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,17 @@ jobs:
fail-fast: false
matrix:
include:
- { name: "MacOS 12", os: macos-12, osx_arch: "x86_64;arm64", build_type: "Debug", fetch_deps: YES }
- { name: "MacOS 12", os: macos-12, osx_arch: "x86_64", build_type: "Release", fetch_deps: NO }
- { name: "MacOS 13", os: macos-13, osx_arch: "x86_64", build_type: "Debug", fetch_deps: NO }
- { name: "MacOS 13", os: macos-13, osx_arch: "x86_64;arm64", build_type: "Release", fetch_deps: YES }
- { name: "MacOS 13", os: macos-13, osx_arch: "x86_64;arm64", build_type: "Debug", fetch_deps: YES }
- { name: "MacOS 13", os: macos-13, osx_arch: "x86_64", build_type: "Release", fetch_deps: NO }
- { name: "MacOS 14", os: macos-14, osx_arch: "arm64", build_type: "Debug", fetch_deps: NO }
- { name: "MacOS 14", os: macos-14, osx_arch: "x86_64;arm64", build_type: "Release", fetch_deps: YES }

name: ${{ matrix.name }} build (static/${{ matrix.build_type }})
runs-on: ${{ matrix.os }}

steps:
- name: Install dependencies
# Homebrew doesn't support universal binaries so only install dependencies for x86_64 builds
# Homebrew doesn't support universal binaries so only install dependencies for arch-specific builds
if: ${{ matrix.fetch_deps == 'NO' }}
run: |
brew install mbedtls
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/ubuntu-build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ jobs:
include:
- { name: "Ubuntu 20.04", os: ubuntu-20.04 }
- { name: "Ubuntu 22.04", os: ubuntu-22.04 }
- { name: "Ubuntu 24.04", os: ubuntu-24.04 }

name: ${{ matrix.name }} build (static/debug)
runs-on: ${{ matrix.os }}
Expand Down Expand Up @@ -49,6 +50,7 @@ jobs:
include:
- { name: "Ubuntu 20.04", os: ubuntu-20.04, ubuntu_release_name: "focal" }
- { name: "Ubuntu 22.04", os: ubuntu-22.04, ubuntu_release_name: "jammy" }
- { name: "Ubuntu 24.04", os: ubuntu-24.04, ubuntu_release_name: "noble" }

name: ${{ matrix.name }} build (release)
runs-on: ${{ matrix.os }}
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@ available as a library as well as a command line tool.
Installation
------------

* For Ubuntu 20.04 LTS (Focal) or Ubuntu 22.04 LTS (Jammy), install the
appropriate [release package](https://github.com/openemv/tr31/releases)
* For Fedora 37, Fedora 38 or Fedora 39, install the appropriate
* For Ubuntu 20.04 LTS (Focal), 22.04 LTS (Jammy), or 24.04 LTS (Noble) install
the appropriate [release package](https://github.com/openemv/tr31/releases)
* For Fedora 39 or Fedora 40, install the appropriate
[release package](https://github.com/openemv/tr31/releases)
* For Gentoo, use the
[OpenEMV overlay](https://github.com/openemv/openemv-overlay), set the
Expand Down

0 comments on commit 9b618a9

Please sign in to comment.