Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cleanup CI for maint-1.3 branch #2157

Merged
merged 1 commit into from
Sep 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
75 changes: 7 additions & 68 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ name: Gating
# events but only for the main branch
on:
push:
branches: [ '*' ]
branches: [ maint-1.3 ]
pull_request:
branches: [ main, maint-1.3 ]
branches: [ maint-1.3 ]


# A workflow run is made up of one or more jobs that can run sequentially or in parallel
Expand All @@ -21,7 +21,7 @@ jobs:

strategy:
matrix:
os: [ubuntu-20.04, ubuntu-latest]
os: [ubuntu-22.04]

# Steps represent a sequence of tasks that will be executed as part of the job
steps:
Expand Down Expand Up @@ -51,10 +51,10 @@ jobs:
ctest --output-on-failure

build-fedora:
name: Build, Test on Fedora Latest (Container)
name: Build, Test on Fedora 40 (Container)
runs-on: ubuntu-latest
container:
image: fedora:latest
image: fedora:40
steps:
- name: Install Deps
run: dnf install -y cmake git dbus-devel GConf2-devel libacl-devel libblkid-devel libcap-devel libcurl-devel libgcrypt-devel libselinux-devel libxml2-devel libxslt-devel libattr-devel make openldap-devel pcre2-devel perl-XML-Parser perl-XML-XPath perl-devel python3-devel python3-dbusmock rpm-devel swig bzip2-devel gcc-c++ libyaml-devel xmlsec1-devel xmlsec1-openssl-devel hostname bzip2 lua rpm-build which strace python3-pytest
Expand All @@ -73,66 +73,6 @@ jobs:
export $(dbus-launch)
ctest --output-on-failure

build-fedora-nss:
name: Build with NSS, Test on Fedora Latest (Container)
runs-on: ubuntu-latest
container:
image: fedora:latest
steps:
- name: Install Deps
run: dnf install -y cmake git dbus-devel GConf2-devel libacl-devel libblkid-devel libcap-devel libcurl-devel nss-devel libselinux-devel libxml2-devel libxslt-devel libattr-devel make openldap-devel pcre2-devel perl-XML-Parser perl-XML-XPath perl-devel python3-devel python3-dbusmock rpm-devel swig bzip2-devel gcc-c++ libyaml-devel xmlsec1-devel xmlsec1-openssl-devel hostname bzip2 lua rpm-build which strace python3-pytest
- name: Checkout
uses: actions/checkout@v3
with:
submodules: recursive
- name: Build
working-directory: ./build
run: |
cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo -DWITH_PCRE2=True -DWITH_CRYPTO=nss ../
make all
- name: Test
working-directory: ./build
run: |
export $(dbus-launch)
ctest --output-on-failure

build-macos:
# The type of runner that the job will run on
name: Build, Test on macOS Latest
runs-on: macos-latest

# Steps represent a sequence of tasks that will be executed as part of the job
steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- uses: actions/checkout@v3

# Runs a single command using the runners shell
- name: Install Deps
run: |
# Unlink and re-link to prevent errors when GitHub Mac runner images
# install Python outside of Brew:
brew list -1 | grep python | while read formula; do brew unlink $formula; brew link --overwrite $formula; done
brew update
brew install doxygen
brew install opendbx
brew install pkg-config
brew install popt
brew install swig
brew install libxmlsec1
brew install openssl
brew install pcre2

# Runs a set of commands using the runners shell
- name: Build
run: |
cd $GITHUB_WORKSPACE/build
cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo -DWITH_PCRE2=True -DENABLE_PROBES=False ../
make all

- name: Test
run: |
cd $GITHUB_WORKSPACE/build
echo "Tests are so broken for macOS :("
build-windows:
name: Build on Windows
runs-on: windows-latest
Expand All @@ -148,7 +88,7 @@ jobs:
path: ${{ github.workspace }}/vcpkg
repository: microsoft/vcpkg
fetch-depth: 1

- name: Bootstrap vcpkg
shell: pwsh
run: "${{ github.workspace }}\\vcpkg\\scripts\\bootstrap.ps1 -disableMetrics"
Expand All @@ -159,7 +99,6 @@ jobs:
script: |
core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || '');
core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '');

- name: Install Deps
run: "${{ github.workspace }}\\vcpkg\\vcpkg.exe install curl libxml2 libxslt bzip2 pcre pthreads zlib getopt-win32 xmlsec --triplet x64-windows"

Expand All @@ -170,7 +109,7 @@ jobs:
- name: Build
run: cmake --build . --config Release
working-directory: ./build

- name: Package
run: cpack
working-directory: build
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: "CodeQL"

on:
push:
branches: [ 'maint-1.3', 'maint-1.2', 'master' ]
branches: [ 'maint-1.3' ]
pull_request:
# The branches below must be a subset of the branches above
branches: [ 'maint-1.3' ]
Expand Down Expand Up @@ -54,6 +54,6 @@ jobs:
make all

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
uses: github/codeql-action/analyze@v3
with:
category: "/language:${{matrix.language}}"
2 changes: 0 additions & 2 deletions .packit.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,13 @@ jobs:
trigger: pull_request
metadata:
targets:
- fedora-all-x86_64
- centos-stream-8-x86_64
- centos-stream-9-x86_64

- job: tests
trigger: pull_request
metadata:
targets:
- fedora-all-x86_64
- centos-stream-8-x86_64
- centos-stream-9-x86_64

Expand Down
Loading