Skip to content

Commit 0b46bb8

Browse files
two-hornedtwo-horned
authored
Merge branch 'master' into mempool_better_preheat
2 parents e6d3f73 + 12ed0ff commit 0b46bb8

File tree

99 files changed

+9868
-14402
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

99 files changed

+9868
-14402
lines changed

‎.forgejo/workflows/ci.yaml‎

Lines changed: 148 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,148 @@
1+
name: ci
2+
on:
3+
pull_request:
4+
# push:
5+
# branches:
6+
# - master
7+
workflow_dispatch:
8+
concurrency:
9+
group: ${{ github.head_ref || github.run_id }}-${{ github.actor }}
10+
cancel-in-progress: true
11+
permissions:
12+
contents: read
13+
env:
14+
# https://codeberg.org/forgejo/forgejo/issues/9244
15+
TERM: dumb
16+
jobs:
17+
aarch64-linux-debug:
18+
runs-on: [self-hosted, aarch64-linux]
19+
steps:
20+
- name: Checkout
21+
uses: actions/checkout@v4
22+
with:
23+
fetch-depth: 0
24+
- name: Build and Test
25+
run: sh ci/aarch64-linux-debug.sh
26+
timeout-minutes: 120
27+
aarch64-linux-release:
28+
runs-on: [self-hosted, aarch64-linux]
29+
steps:
30+
- name: Checkout
31+
uses: actions/checkout@v4
32+
with:
33+
fetch-depth: 0
34+
- name: Build and Test
35+
run: sh ci/aarch64-linux-release.sh
36+
timeout-minutes: 120
37+
loongarch64-linux-debug:
38+
runs-on: [self-hosted, loongarch64-linux]
39+
steps:
40+
- name: Checkout
41+
uses: actions/checkout@v4
42+
with:
43+
fetch-depth: 0
44+
- name: Build and Test
45+
run: sh ci/loongarch64-linux-debug.sh
46+
timeout-minutes: 180
47+
loongarch64-linux-release:
48+
runs-on: [self-hosted, loongarch64-linux]
49+
steps:
50+
- name: Checkout
51+
uses: actions/checkout@v4
52+
with:
53+
fetch-depth: 0
54+
- name: Build and Test
55+
run: sh ci/loongarch64-linux-release.sh
56+
timeout-minutes: 180
57+
riscv64-linux-debug:
58+
# if: github.event_name != 'pull_request'
59+
runs-on: [self-hosted, riscv64-linux]
60+
steps:
61+
- name: Checkout
62+
uses: actions/checkout@v4
63+
with:
64+
fetch-depth: 0
65+
- name: Build and Test
66+
run: sh ci/riscv64-linux-debug.sh
67+
timeout-minutes: 420
68+
riscv64-linux-release:
69+
# if: github.event_name != 'pull_request'
70+
runs-on: [self-hosted, riscv64-linux]
71+
steps:
72+
- name: Checkout
73+
uses: actions/checkout@v4
74+
with:
75+
fetch-depth: 0
76+
- name: Build and Test
77+
run: sh ci/riscv64-linux-release.sh
78+
timeout-minutes: 420
79+
x86_64-freebsd-debug:
80+
runs-on: [self-hosted, x86_64-freebsd]
81+
steps:
82+
- name: Checkout
83+
uses: actions/checkout@v4
84+
with:
85+
fetch-depth: 0
86+
- name: Build and Test
87+
run: sh ci/x86_64-freebsd-debug.sh
88+
timeout-minutes: 120
89+
x86_64-freebsd-release:
90+
runs-on: [self-hosted, x86_64-freebsd]
91+
steps:
92+
- name: Checkout
93+
uses: actions/checkout@v4
94+
with:
95+
fetch-depth: 0
96+
- name: Build and Test
97+
run: sh ci/x86_64-freebsd-release.sh
98+
timeout-minutes: 120
99+
x86_64-linux-debug:
100+
runs-on: [self-hosted, x86_64-linux]
101+
steps:
102+
- name: Checkout
103+
uses: actions/checkout@v4
104+
with:
105+
fetch-depth: 0
106+
- name: Build and Test
107+
run: sh ci/x86_64-linux-debug.sh
108+
timeout-minutes: 240
109+
x86_64-linux-debug-llvm:
110+
runs-on: [self-hosted, x86_64-linux]
111+
steps:
112+
- name: Checkout
113+
uses: actions/checkout@v4
114+
with:
115+
fetch-depth: 0
116+
- name: Build and Test
117+
run: sh ci/x86_64-linux-debug-llvm.sh
118+
timeout-minutes: 480
119+
x86_64-linux-release:
120+
runs-on: [self-hosted, x86_64-linux]
121+
steps:
122+
- name: Checkout
123+
uses: actions/checkout@v4
124+
with:
125+
fetch-depth: 0
126+
- name: Build and Test
127+
run: sh ci/x86_64-linux-release.sh
128+
timeout-minutes: 420
129+
x86_64-windows-debug:
130+
runs-on: [self-hosted, x86_64-windows]
131+
steps:
132+
- name: Checkout
133+
uses: actions/checkout@v4
134+
with:
135+
fetch-depth: 0
136+
- name: Build and Test
137+
run: ci/x86_64-windows-debug.ps1
138+
timeout-minutes: 180
139+
x86_64-windows-release:
140+
runs-on: [self-hosted, x86_64-windows]
141+
steps:
142+
- name: Checkout
143+
uses: actions/checkout@v4
144+
with:
145+
fetch-depth: 0
146+
- name: Build and Test
147+
run: ci/x86_64-windows-release.ps1
148+
timeout-minutes: 180

‎.github/CODE_OF_CONDUCT.md‎

Lines changed: 0 additions & 75 deletions
This file was deleted.

‎.github/CONTRIBUTING.md‎

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎.github/FUNDING.yml‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎.github/workflows/ci.yaml‎

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ jobs:
1818
steps:
1919
- name: Checkout
2020
uses: actions/checkout@v4
21+
with:
22+
fetch-depth: 0
2123
- name: Build and Test
2224
run: sh ci/x86_64-linux-debug.sh
2325
x86_64-linux-debug-llvm:
@@ -26,6 +28,8 @@ jobs:
2628
steps:
2729
- name: Checkout
2830
uses: actions/checkout@v4
31+
with:
32+
fetch-depth: 0
2933
- name: Build and Test
3034
run: sh ci/x86_64-linux-debug-llvm.sh
3135
x86_64-linux-release:
@@ -34,57 +38,63 @@ jobs:
3438
steps:
3539
- name: Checkout
3640
uses: actions/checkout@v4
41+
with:
42+
fetch-depth: 0
3743
- name: Build and Test
3844
run: sh ci/x86_64-linux-release.sh
3945
aarch64-linux-debug:
4046
runs-on: [self-hosted, Linux, aarch64]
4147
steps:
4248
- name: Checkout
4349
uses: actions/checkout@v4
50+
with:
51+
fetch-depth: 0
4452
- name: Build and Test
4553
run: sh ci/aarch64-linux-debug.sh
4654
aarch64-linux-release:
4755
runs-on: [self-hosted, Linux, aarch64]
4856
steps:
4957
- name: Checkout
5058
uses: actions/checkout@v4
59+
with:
60+
fetch-depth: 0
5161
- name: Build and Test
5262
run: sh ci/aarch64-linux-release.sh
5363
aarch64-macos-debug:
5464
runs-on: [self-hosted, macOS, aarch64]
55-
env:
56-
ARCH: "aarch64"
5765
steps:
5866
- name: Checkout
5967
uses: actions/checkout@v4
68+
with:
69+
fetch-depth: 0
6070
- name: Build and Test
6171
run: ci/aarch64-macos-debug.sh
6272
aarch64-macos-release:
6373
runs-on: [self-hosted, macOS, aarch64]
64-
env:
65-
ARCH: "aarch64"
6674
steps:
6775
- name: Checkout
6876
uses: actions/checkout@v4
77+
with:
78+
fetch-depth: 0
6979
- name: Build and Test
7080
run: ci/aarch64-macos-release.sh
7181
x86_64-windows-debug:
7282
timeout-minutes: 420
7383
runs-on: [self-hosted, Windows, x86_64]
74-
env:
75-
ARCH: "x86_64"
7684
steps:
7785
- name: Checkout
7886
uses: actions/checkout@v4
87+
with:
88+
fetch-depth: 0
7989
- name: Build and Test
8090
run: ci/x86_64-windows-debug.ps1
8191
x86_64-windows-release:
8292
timeout-minutes: 420
8393
runs-on: [self-hosted, Windows, x86_64]
84-
env:
85-
ARCH: "x86_64"
8694
steps:
8795
- name: Checkout
8896
uses: actions/checkout@v4
97+
with:
98+
fetch-depth: 0
8999
- name: Build and Test
90100
run: ci/x86_64-windows-release.ps1

‎CMakeLists.txt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -561,7 +561,6 @@ set(ZIG_STAGE2_SOURCES
561561
src/libs/libunwind.zig
562562
src/link.zig
563563
src/link/C.zig
564-
src/link/Coff.zig
565564
src/link/Dwarf.zig
566565
src/link/Elf.zig
567566
src/link/Elf/Archive.zig

‎ci/aarch64-linux-debug.sh‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,14 @@
55
set -x
66
set -e
77

8-
ARCH="$(uname -m)"
9-
TARGET="$ARCH-linux-musl"
8+
TARGET="aarch64-linux-musl"
109
MCPU="baseline"
1110
CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.16.0-dev.104+689461e31"
1211
PREFIX="$HOME/deps/$CACHE_BASENAME"
1312
ZIG="$PREFIX/bin/zig"
1413

1514
export PATH="$HOME/local/bin:$PATH"
1615

17-
# Make the `zig version` number consistent.
18-
# This will affect the cmake command below.
19-
git fetch --unshallow || true
20-
git fetch --tags
21-
2216
# Override the cache directories because they won't actually help other CI runs
2317
# which will be testing alternate versions of zig, and ultimately would just
2418
# fill up space on the hard drive for no reason.

‎ci/aarch64-linux-release.sh‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,14 @@
55
set -x
66
set -e
77

8-
ARCH="$(uname -m)"
9-
TARGET="$ARCH-linux-musl"
8+
TARGET="aarch64-linux-musl"
109
MCPU="baseline"
1110
CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.16.0-dev.104+689461e31"
1211
PREFIX="$HOME/deps/$CACHE_BASENAME"
1312
ZIG="$PREFIX/bin/zig"
1413

1514
export PATH="$HOME/local/bin:$PATH"
1615

17-
# Make the `zig version` number consistent.
18-
# This will affect the cmake command below.
19-
git fetch --unshallow || true
20-
git fetch --tags
21-
2216
# Override the cache directories because they won't actually help other CI runs
2317
# which will be testing alternate versions of zig, and ultimately would just
2418
# fill up space on the hard drive for no reason.

‎ci/aarch64-macos-debug.sh‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,8 @@
33
set -x
44
set -e
55

6-
# Script assumes the presence of the following:
7-
# s3cmd
8-
96
ZIGDIR="$PWD"
10-
TARGET="$ARCH-macos-none"
7+
TARGET="aarch64-macos-none"
118
MCPU="baseline"
129
CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.16.0-dev.104+689461e31"
1310
PREFIX="$HOME/$CACHE_BASENAME"
@@ -21,11 +18,6 @@ fi
2118

2219
cd $ZIGDIR
2320

24-
# Make the `zig version` number consistent.
25-
# This will affect the cmake command below.
26-
git fetch --unshallow || true
27-
git fetch --tags
28-
2921
# Override the cache directories because they won't actually help other CI runs
3022
# which will be testing alternate versions of zig, and ultimately would just
3123
# fill up space on the hard drive for no reason.

0 commit comments

Comments
 (0)