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.

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

CI: Update to latest actions version and base image #752

Merged
merged 2 commits into from
Feb 13, 2025
Merged

CI: Update to latest actions version and base image #752

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
347265f
data/check-style: Try newer Clang versions
aperezdc Feb 12, 2025
648937e
CI: Update to latest actions version and base image
aperezdc Feb 12, 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
6 changes: 3 additions & 3 deletions .github/workflows/ci-cross.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@ jobs:
strategy:
matrix:
buildtype: [release, debug]
runs-on: ubuntu-20.04
runs-on: ubuntu-24.04
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Cache
uses: actions/cache@v3
uses: actions/cache@v4
id: cache
with:
path: ~/toolchain
Expand Down
14 changes: 9 additions & 5 deletions .github/workflows/ci-native.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,16 @@ on:

jobs:
build:
# TODO: It would be nice to move away from Ubuntu 22.04, but that would
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The webkit-container-sdk is a 24.04 image with the dependencies :)

Can make an image based on it with webkit built.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, we could but GitHub self-hosted runners won't take an arbitrary image. That would mean switching over to our own runner, so I would rather do it in separately.

# need either building WPE WebKit, finding a PPA for it, or using
# a self-hosted runner with preconfigured base system including
# the needed dependencies.
runs-on: ubuntu-22.04
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Cache
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: |
~/.cache/pip
Expand Down Expand Up @@ -103,15 +107,15 @@ jobs:
publish:
if: ${{ github.ref == 'refs/heads/master' }}
needs: build
runs-on: ubuntu-20.04
runs-on: ubuntu-24.04
steps:
- name: Fetch Documentation
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: docs
path: html
- name: Deploy Documentation
uses: peaceiris/actions-gh-pages@v3
uses: peaceiris/actions-gh-pages@v4
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
publish_dir: html
10 changes: 3 additions & 7 deletions .github/workflows/codestyle.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,22 +8,18 @@ on:

jobs:
check:
runs-on: ubuntu-20.04
runs-on: ubuntu-24.04
steps:
- name: Checkout Head
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Fetch Git History
run: |
git fetch --no-tags --prune --depth=1 \
origin +refs/heads/master:refs/remotes/origin/master
- name: Install Tools
run: |
curl -sL https://apt.llvm.org/llvm-snapshot.gpg.key | \
sudo apt-key add -
sudo add-apt-repository \
'deb http://apt.llvm.org/focal/ llvm-toolchain-focal-13 main'
sudo apt update
sudo apt install -y clang-format-13 diffutils
sudo apt install -y clang-format-18 diffutils
- name: Check
run: |
data/check-style -ocode-style.diff origin/master
Expand Down
12 changes: 12 additions & 0 deletions data/check-style
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,18 @@ declare -r BASE HEAD

declare -ra clang_format_diff_candidates=(
# Search in $PATH (Ubuntu, Debian, maybe others)
clang-format-diff-19
clang-format-diff-19.py
clang-format-diff-18
clang-format-diff-18.py
clang-format-diff-17
clang-format-diff-17.py
clang-format-diff-16
clang-format-diff-16.py
clang-format-diff-15
clang-format-diff-15.py
clang-format-diff-14
clang-format-diff-14.py
clang-format-diff-13
clang-format-diff-13.py
clang-format-diff
Expand Down