Skip to content

merge queue: embarking master (cc985a0) and #359 together #360

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.

Sign up for GitHub

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

Closed
wants to merge 2 commits into from
Closed

merge queue: embarking master (cc985a0) and #359 together #360

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0b16408
workflows: use ubuntu-latest on all jobs
phlogistonjohn Apr 28, 2025
7a9c8cf
Merge of #359
mergify[bot] Apr 29, 2025
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
5 changes: 2 additions & 3 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ jobs:
- name: run the tests
run: make test
podmanbuild:
runs-on: ubuntu-20.04
runs-on: ubuntu-latest
# don't run on push, since the "push" job contains the
# image build step, so no need to do it twice.
if: github.event_name == 'pull_request'
Expand Down Expand Up @@ -91,8 +91,7 @@ jobs:
run: make CONTAINER_CMD=docker image-build
test-kubernetes:
#runs-on: ubuntu-latest
# need to explicitly use 20.04 to avoid problems with jq...
runs-on: ubuntu-20.04
runs-on: ubuntu-latest
env:
CONTAINER_CMD: docker
PR_NUM: ${{ github.event.pull_request.number }}
Expand Down
Loading