Skip to content

Commit

Permalink
Merge pull request lxc#4453 from mihalicyn/update_githubci_ubuntu24
Browse files Browse the repository at this point in the history
Update GitHub Actions to use Ubuntu 24.04
  • Loading branch information
stgraber authored Jun 26, 2024
2 parents faedbcb + 4892749 commit 2b99fae
Show file tree
Hide file tree
Showing 6 changed files with 19 additions and 5 deletions.
5 changes: 5 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,11 @@ jobs:
- clang
os:
- ubuntu-22.04
- ubuntu-24.04
# temporary workaround for https://bugs.launchpad.net/ubuntu/+source/llvm-toolchain-18/+bug/2064187
exclude:
- compiler: clang
os: ubuntu-24.04
runs-on: ${{ matrix.os }}
steps:
- name: Checkout code
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cifuzz.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ permissions:
contents: read
jobs:
Fuzzing:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
if: github.repository == 'lxc/lxc'
strategy:
fail-fast: false
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/commits.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
permissions:
pull-requests: read # for tim-actions/get-pr-commits to get list of commits from the PR
name: Signed-off-by (DCO)
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- name: Get PR Commits
id: 'get-pr-commits'
Expand All @@ -27,7 +27,7 @@ jobs:
permissions:
contents: none
name: Branch target
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- name: Check branch target
env:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/coverity.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ permissions:

jobs:
test:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- name: Checkout code
uses: actions/checkout@v4
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/static-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ permissions:

jobs:
test:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- name: Checkout code
uses: actions/checkout@v4
Expand All @@ -26,4 +26,5 @@ jobs:
run: |
cd config/apparmor/
./lxc-generate-aa-rules.py container-rules.base > container-rules
cat abstractions/container-base.in container-rules > abstractions/container-base
git diff --exit-code
8 changes: 8 additions & 0 deletions src/lxc/storage/zfs.c
Original file line number Diff line number Diff line change
Expand Up @@ -500,12 +500,20 @@ int zfs_clonepaths(struct lxc_storage *orig, struct lxc_storage *new,
*/
dataset_len = strlen(dataset);
len = 4 + dataset_len + 1 + strlen(cname) + 1;

/* see https://gcc.gnu.org/bugzilla/show_bug.cgi?id=104069 */
#pragma GCC diagnostic push
#if defined __GNUC__ && __GNUC__ >= 12
#pragma GCC diagnostic ignored "-Wuse-after-free"
#endif
new->src = realloc(dataset, len);
if (!new->src) {
ERROR("Failed to reallocate memory");
free(dataset);
return -1;
}
#pragma GCC diagnostic pop

memmove(new->src + 4, new->src, dataset_len);
memmove(new->src, "zfs:", 4);

Expand Down

0 comments on commit 2b99fae

Please sign in to comment.