Skip to content

Commit 99419d9

Browse files
committed
Merge branch 'main' into rlib-patches
2 parents fd237cd + 9242b9e commit 99419d9

File tree

2 files changed

+18
-4
lines changed

2 files changed

+18
-4
lines changed

.github/workflows/tests.yaml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ on:
66
workflows: [ Sanity checks ]
77
types: [ completed ]
88
branches: [ main ]
9+
workflow_dispatch:
910

1011
jobs:
1112
deps:
@@ -40,7 +41,7 @@ jobs:
4041
- deps
4142
strategy:
4243
matrix:
43-
version: [ 7.3, 7.4, 7.5 ]
44+
version: [ 7.3, 7.4, 7.5, 7.6 ]
4445
arch: [ amd64, i386 ]
4546
runs-on: ubuntu-latest
4647
container:
@@ -88,7 +89,7 @@ jobs:
8889
- base
8990
strategy:
9091
matrix:
91-
version: [ 7.5 ]
92+
version: [ 7.6 ]
9293
arch: [ amd64 ]
9394
runs-on: ubuntu-latest
9495
env:
@@ -99,7 +100,7 @@ jobs:
99100

100101
steps:
101102
- name: Install essentials
102-
run: apk add bash python3 tar
103+
run: apk add bash python3 tar wget
103104

104105
- name: Check out repository code
105106
uses: actions/checkout@v4
@@ -120,7 +121,7 @@ jobs:
120121
openbsd
121122
122123
- name: Run test
123-
run: tests/example -v ${{ matrix.version }} -a ${{ matrix.arch }}
124+
run: timeout 1800 tests/example -v ${{ matrix.version }} -a ${{ matrix.arch }}
124125

125126
- name: Keep artifacts
126127
uses: actions/upload-artifact@v4

openbsd

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,18 @@ class Version:
7878
return cls.versions.get(version)
7979

8080
DEFAULT_VERSION = Version.add(
81+
version = "7.6",
82+
pub = lines(
83+
"untrusted comment: openbsd 7.6 base public key",
84+
"RWTkuwn4mbq8ouJbfO4VfNH8+FdiZUosz2qIR0V0C9bm6CnVEt7CGkV0",
85+
),
86+
archs = {
87+
"amd64": "ca4df9a3edb7e86347240044d8c003d0f48f6460c0d4c37352624fe5b57bf830",
88+
"i386": "baa0483450dc79c5cae2741530d6e3c2e6858a9836e03bff96fcf75e396124c0",
89+
},
90+
)
91+
92+
Version.add(
8193
version = "7.5",
8294
pub = lines(
8395
"untrusted comment: openbsd 7.5 public key",
@@ -1131,6 +1143,7 @@ class Autoinstall:
11311143
os.makedirs(self.sets)
11321144

11331145
os.symlink(files.get("SHA256.sig", verify=False), os.path.join(self.sets, "SHA256.sig"))
1146+
os.symlink(files.get("BUILDINFO"), os.path.join(self.sets, "BUILDINFO"))
11341147

11351148
for s in sets:
11361149
if s == "site":

0 commit comments

Comments
 (0)