Skip to content

Commit 765bd10

Browse files
authored
Merge pull request #455 from brianegge/master
Various build tool updates
2 parents 0466456 + 43f8936 commit 765bd10

File tree

3 files changed

+20
-14
lines changed

3 files changed

+20
-14
lines changed

.github/workflows/build.yml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ jobs:
88
os: [ubuntu-20.04]
99
clang: [8]
1010
steps:
11-
- uses: actions/checkout@v3
11+
- uses: actions/checkout@v4
1212
with:
1313
# Nix Flakes doesn't work on shallow clones
1414
fetch-depth: 0
15-
- uses: cachix/install-nix-action@v18
15+
- uses: cachix/install-nix-action@v30
1616
with:
1717
install_url: https://github.com/numtide/nix-flakes-installer/releases/download/nix-2.4pre20201221_9fab14a/install
1818
extra_nix_config: |
@@ -26,9 +26,9 @@ jobs:
2626
nix log .#hobbesPackages/clang-${{ matrix.clang }}-ASanAndUBSan/hobbes &> ${{ matrix.os }}-clang-${{ matrix.clang }}-ASanAndUBSan-hobbes.log
2727
- name: upload log ${{ matrix.os }}-clang-${{ matrix.clang }}-ASanAndUBSan-hobbes.log
2828
if: ${{ always() }}
29-
uses: actions/upload-artifact@v3
29+
uses: actions/upload-artifact@v4
3030
with:
31-
name: output-log-file
31+
name: output-log-file-${{ matrix.os }}-clang-${{ matrix.clang }}-ASanAndUBSan-hobbes
3232
path: ${{ matrix.os }}-clang-${{ matrix.clang }}-ASanAndUBSan-hobbes.log
3333
linux-clang-build:
3434
runs-on: ${{matrix.os}}
@@ -37,11 +37,11 @@ jobs:
3737
os: [ubuntu-20.04]
3838
clang: [6, 8, 10, 11, 12]
3939
steps:
40-
- uses: actions/checkout@v3
40+
- uses: actions/checkout@v4
4141
with:
4242
# Nix Flakes doesn't work on shallow clones
4343
fetch-depth: 0
44-
- uses: cachix/install-nix-action@v18
44+
- uses: cachix/install-nix-action@v30
4545
with:
4646
install_url: https://github.com/numtide/nix-flakes-installer/releases/download/nix-2.4pre20201221_9fab14a/install
4747
extra_nix_config: |
@@ -55,9 +55,9 @@ jobs:
5555
nix log .#hobbesPackages/clang-${{ matrix.clang }}/hobbes &> ${{ matrix.os }}-clang-${{ matrix.clang }}-hobbes.log
5656
- name: upload log ${{ matrix.os }}-clang-${{ matrix.clang }}-hobbes.log
5757
if: ${{ always() }}
58-
uses: actions/upload-artifact@v3
58+
uses: actions/upload-artifact@v4
5959
with:
60-
name: output-log-file
60+
name: output-log-file-${{ matrix.os }}-clang-${{ matrix.clang }}
6161
path: ${{ matrix.os }}-clang-${{ matrix.clang }}-hobbes.log
6262
linux-gcc-build:
6363
runs-on: ${{matrix.os}}
@@ -67,11 +67,11 @@ jobs:
6767
gcc: [10]
6868
llvm: [6, 8, 10, 11, 12]
6969
steps:
70-
- uses: actions/checkout@v3
70+
- uses: actions/checkout@v4
7171
with:
7272
# Nix Flakes doesn't work on shallow clones
7373
fetch-depth: 0
74-
- uses: cachix/install-nix-action@v18
74+
- uses: cachix/install-nix-action@v30
7575
with:
7676
install_url: https://github.com/numtide/nix-flakes-installer/releases/download/nix-2.4pre20201221_9fab14a/install
7777
extra_nix_config: |
@@ -85,7 +85,7 @@ jobs:
8585
nix log .#hobbesPackages/gcc-${{ matrix.gcc }}/llvm-${{ matrix.llvm }}/hobbes &> ${{ matrix.os }}-gcc-${{ matrix.gcc }}-llvm-${{ matrix.llvm }}-hobbes.log
8686
- name: upload log ${{ matrix.os }}-gcc-${{ matrix.gcc }}-llvm-${{ matrix.llvm }}-hobbes.log
8787
if: ${{ always() }}
88-
uses: actions/upload-artifact@v3
88+
uses: actions/upload-artifact@v4
8989
with:
90-
name: output-log-file
91-
path: ${{ matrix.os }}-gcc-${{ matrix.gcc }}-llvm-${{ matrix.llvm }}-hobbes.log
90+
name: output-log-file-${{ matrix.os }}-gcc-${{ matrix.gcc }}-llvm-${{ matrix.llvm }}
91+
path: ${{ matrix.os }}-gcc-${{ matrix.gcc }}-llvm-${{ matrix.llvm }}-hobbes.log

docker/build/xenial.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:xenial
1+
FROM ubuntu:noble
22
ARG DEPS
33
ENV ARGS -V
44
RUN apt update

renovate.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
3+
"extends": [
4+
"config:recommended"
5+
]
6+
}

0 commit comments

Comments
 (0)