Skip to content

Commit

Permalink
Move to a clang-format which knows about C++20 (#1361)
Browse files Browse the repository at this point in the history
  • Loading branch information
ktf authored Nov 19, 2024
1 parent 18858ff commit 07b3217
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 12 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/c++-code-formatting.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:

steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v5
with:
ref: ${{ github.event.pull_request.head.sha }}
persist-credentials: false
Expand Down Expand Up @@ -148,7 +148,7 @@ jobs:

steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v5
with:
ref: ${{ github.event.pull_request.head.sha }}
persist-credentials: false
Expand Down Expand Up @@ -245,7 +245,7 @@ jobs:
sudo -n apt install dos2unix
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v5
with:
ref: ${{ github.event.pull_request.head.sha }}
persist-credentials: false
Expand Down Expand Up @@ -301,7 +301,7 @@ jobs:

steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v5
with:
ref: ${{ github.event.pull_request.head.sha }}
persist-credentials: false
Expand Down Expand Up @@ -383,7 +383,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v5
with:
ref: ${{ github.event.pull_request.head.sha }}
persist-credentials: false
Expand Down
15 changes: 8 additions & 7 deletions .github/workflows/o2-full-deps.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
# Create repositories with all O2 prerequisites plus aliBuild and push them
# upstream (e.g. to S3).
name: Build o2-full-deps repositories
name: "Build o2-full-deps repositories"

# Controls when the action will run. This workflow is triggered manually.
"on":
Expand Down Expand Up @@ -38,7 +38,7 @@ jobs:
container: fedora:40
alibuild_tag: v1.17.12

name: RPM (${{ matrix.el_version }})
name: "RPM (${{ matrix.el_version }})"
container: ${{ matrix.container }}
env:
ALIBUILD_TAG: ${{ matrix.alibuild_tag }}
Expand All @@ -47,8 +47,9 @@ jobs:

steps:
# For rpms/*.spec
- uses: actions/checkout@v3
- name: Install prerequisites
- uses: actions/checkout@v5

- name: "Install prerequisites"
run: |
set -ex
if [[ "$DISTRO" == "el7" ]]; then
Expand All @@ -66,7 +67,7 @@ jobs:
${{ secrets.S3_RCLONE_CONFIG }}
EOF
- name: Build the ${{ matrix.el_version }} RPM and create a yum repo
- name: "Build the ${{ matrix.el_version }} RPM and create a yum repo"
run: |
set -ex
rpmbuild -ba "rpms/o2-prereq-$DISTRO.spec"
Expand Down Expand Up @@ -107,7 +108,7 @@ jobs:
ALIBUILD_DISTRO: ${{ matrix.ubuntu_codename }}
DEBIAN_FRONTEND: noninteractive
steps:
- name: Install prerequisites
- name: "Install prerequisites"
run: |
apt update
apt install -y vim git devscripts build-essential lintian debhelper dh-python python3-all python3-setuptools python3-setuptools-scm
Expand All @@ -116,7 +117,7 @@ jobs:
echo "pinentry-mode loopback" >> ~/.gnupg/gpg.conf
echo -n "${{ secrets.LAUNCHPAD_PPA_GPG_KEY }}" | gpg --no-tty --batch --import
- name: Build a DEB for Ubuntu and push it to the PPA
- name: "Build a DEB for Ubuntu and push it to the PPA"
run: |
set -x
git clone https://github.com/alisw/alibuild
Expand Down

0 comments on commit 07b3217

Please sign in to comment.