Skip to content

Commit

Permalink
Merge pull request #455 from brianegge/master
Browse files Browse the repository at this point in the history
Various build tool updates
  • Loading branch information
dawa79 authored Oct 26, 2024
2 parents 0466456 + 43f8936 commit 765bd10
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 14 deletions.
26 changes: 13 additions & 13 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ jobs:
os: [ubuntu-20.04]
clang: [8]
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
# Nix Flakes doesn't work on shallow clones
fetch-depth: 0
- uses: cachix/install-nix-action@v18
- uses: cachix/install-nix-action@v30
with:
install_url: https://github.com/numtide/nix-flakes-installer/releases/download/nix-2.4pre20201221_9fab14a/install
extra_nix_config: |
Expand All @@ -26,9 +26,9 @@ jobs:
nix log .#hobbesPackages/clang-${{ matrix.clang }}-ASanAndUBSan/hobbes &> ${{ matrix.os }}-clang-${{ matrix.clang }}-ASanAndUBSan-hobbes.log
- name: upload log ${{ matrix.os }}-clang-${{ matrix.clang }}-ASanAndUBSan-hobbes.log
if: ${{ always() }}
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: output-log-file
name: output-log-file-${{ matrix.os }}-clang-${{ matrix.clang }}-ASanAndUBSan-hobbes
path: ${{ matrix.os }}-clang-${{ matrix.clang }}-ASanAndUBSan-hobbes.log
linux-clang-build:
runs-on: ${{matrix.os}}
Expand All @@ -37,11 +37,11 @@ jobs:
os: [ubuntu-20.04]
clang: [6, 8, 10, 11, 12]
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
# Nix Flakes doesn't work on shallow clones
fetch-depth: 0
- uses: cachix/install-nix-action@v18
- uses: cachix/install-nix-action@v30
with:
install_url: https://github.com/numtide/nix-flakes-installer/releases/download/nix-2.4pre20201221_9fab14a/install
extra_nix_config: |
Expand All @@ -55,9 +55,9 @@ jobs:
nix log .#hobbesPackages/clang-${{ matrix.clang }}/hobbes &> ${{ matrix.os }}-clang-${{ matrix.clang }}-hobbes.log
- name: upload log ${{ matrix.os }}-clang-${{ matrix.clang }}-hobbes.log
if: ${{ always() }}
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: output-log-file
name: output-log-file-${{ matrix.os }}-clang-${{ matrix.clang }}
path: ${{ matrix.os }}-clang-${{ matrix.clang }}-hobbes.log
linux-gcc-build:
runs-on: ${{matrix.os}}
Expand All @@ -67,11 +67,11 @@ jobs:
gcc: [10]
llvm: [6, 8, 10, 11, 12]
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
# Nix Flakes doesn't work on shallow clones
fetch-depth: 0
- uses: cachix/install-nix-action@v18
- uses: cachix/install-nix-action@v30
with:
install_url: https://github.com/numtide/nix-flakes-installer/releases/download/nix-2.4pre20201221_9fab14a/install
extra_nix_config: |
Expand All @@ -85,7 +85,7 @@ jobs:
nix log .#hobbesPackages/gcc-${{ matrix.gcc }}/llvm-${{ matrix.llvm }}/hobbes &> ${{ matrix.os }}-gcc-${{ matrix.gcc }}-llvm-${{ matrix.llvm }}-hobbes.log
- name: upload log ${{ matrix.os }}-gcc-${{ matrix.gcc }}-llvm-${{ matrix.llvm }}-hobbes.log
if: ${{ always() }}
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: output-log-file
path: ${{ matrix.os }}-gcc-${{ matrix.gcc }}-llvm-${{ matrix.llvm }}-hobbes.log
name: output-log-file-${{ matrix.os }}-gcc-${{ matrix.gcc }}-llvm-${{ matrix.llvm }}
path: ${{ matrix.os }}-gcc-${{ matrix.gcc }}-llvm-${{ matrix.llvm }}-hobbes.log
2 changes: 1 addition & 1 deletion docker/build/xenial.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:xenial
FROM ubuntu:noble
ARG DEPS
ENV ARGS -V
RUN apt update
Expand Down
6 changes: 6 additions & 0 deletions renovate.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
"extends": [
"config:recommended"
]
}

0 comments on commit 765bd10

Please sign in to comment.