Skip to content

Commit fe5996b

Browse files
aleflmaleflm
committed
fix glibc version and CIs
1 parent 83fa52e commit fe5996b

File tree

4 files changed

+23
-32
lines changed

4 files changed

+23
-32
lines changed

‎.github/workflows/ci-master.yml‎

Lines changed: 14 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ jobs:
4545
name: ${{ env.SOURCE_ARTIFACT }}
4646
path: ${{ env.SOURCE_ARTIFACT_DIR }}
4747
build-linux-cmake:
48-
if: false
4948
name: build-linux-cmake
5049
runs-on: ubuntu-latest
5150
env:
@@ -116,7 +115,6 @@ jobs:
116115
name: test-cmake-logs
117116
path: ${{ env.TEST_LOG_ARTIFACT_DIR }}
118117
build-linux-autotools:
119-
if: false
120118
name: build-linux-autotools
121119
needs: create-source-distribution
122120
runs-on: ubuntu-latest
@@ -193,7 +191,6 @@ jobs:
193191
name: test-autotools-logs
194192
path: ${{ env.TEST_LOG_ARTIFACT_DIR }}
195193
build-windows-autotools:
196-
if: false
197194
name: build-windows-autotools
198195
needs: create-source-distribution
199196
runs-on: ubuntu-latest
@@ -236,7 +233,6 @@ jobs:
236233
name: windows-autotools-binaries
237234
path: ${{ env.ARTIFACT_DIR }}
238235
build-windows-cmake:
239-
if: false
240236
name: build-windows-cmake
241237
runs-on: ubuntu-latest
242238
env:
@@ -272,7 +268,6 @@ jobs:
272268
name: windows-cmake-binaries
273269
path: ${{ env.ARTIFACT_DIR }}
274270
build-mac-cmake:
275-
if: false
276271
name: build-mac-cmake
277272
runs-on: macos-latest
278273
env:
@@ -322,7 +317,6 @@ jobs:
322317
name: mac-cmake-binaries
323318
path: ${{ env.ARTIFACT_DIR }}
324319
build-mac-autotools:
325-
if: false
326320
name: build-mac-autotools
327321
needs: create-source-distribution
328322
runs-on: macos-latest
@@ -371,12 +365,12 @@ jobs:
371365
name: mac-autotools-binaries
372366
path: ${{ env.ARTIFACT_DIR }}
373367
build-guix-x86_64-linux-gnu:
374-
if: false
375368
name: build-guix-x86_64-linux-gnu
376369
runs-on: ubuntu-22.04
377370
env:
378371
HOST: x86_64-linux-gnu
379372
ARTIFACT_DIR: guix-binaries-x86_64-linux-gnu
373+
SUBSTITUTE_URLS: "https://ci.guix.gnu.org https://bordeaux.guix.gnu.org https://hydra-guix-129.guix.gnu.org"
380374
steps:
381375
- name: Checkout
382376
uses: actions/checkout@v4
@@ -388,13 +382,12 @@ jobs:
388382
run: |
389383
sudo apt-get update
390384
sudo apt-get install -y guix
391-
guix pull --url=https://codeberg.org/guix/guix-mirror
385+
guix pull --url=https://codeberg.org/guix/guix-mirror --substitute-urls='https://ci.guix.gnu.org https://bordeaux.guix.gnu.org https://hydra-guix-129.guix.gnu.org'
392386
- name: Run Guix Build
393387
run: |
394388
CORES=$(nproc)
395389
env HOSTS="${HOST}" \
396-
ADDITIONAL_GUIX_COMMON_FLAGS="--cores=$CORES --max-jobs=$CORES --substitute-urls='https://ci.guix.gnu.org https://bordeaux.guix.gnu.org https://hydra-guix-129.guix.gnu.org'" \
397-
./contrib/guix/guix-build
390+
ADDITIONAL_GUIX_COMMON_FLAGS="--cores=$CORES --max-jobs=$CORES" ./contrib/guix/guix-build
398391
- name: Prepare Files for Artifact
399392
run: |
400393
mkdir -p $ARTIFACT_DIR
@@ -405,12 +398,12 @@ jobs:
405398
name: guix-binaries-x86_64-linux-gnu
406399
path: ${{ env.ARTIFACT_DIR }}
407400
build-guix-aarch64-linux-gnu:
408-
if: false
409401
name: build-guix-aarch64-linux-gnu
410402
runs-on: ubuntu-22.04
411403
env:
412404
HOST: aarch64-linux-gnu
413405
ARTIFACT_DIR: guix-binaries-aarch64-linux-gnu
406+
SUBSTITUTE_URLS: "https://ci.guix.gnu.org https://bordeaux.guix.gnu.org https://hydra-guix-129.guix.gnu.org"
414407
steps:
415408
- name: Checkout
416409
uses: actions/checkout@v4
@@ -422,13 +415,12 @@ jobs:
422415
run: |
423416
sudo apt-get update
424417
sudo apt-get install -y guix
425-
guix pull --url=https://codeberg.org/guix/guix-mirror
418+
guix pull --url=https://codeberg.org/guix/guix-mirror --substitute-urls='https://ci.guix.gnu.org https://bordeaux.guix.gnu.org https://hydra-guix-129.guix.gnu.org'
426419
- name: Run Guix Build
427420
run: |
428421
CORES=$(nproc)
429422
env HOSTS="${HOST}" \
430-
ADDITIONAL_GUIX_COMMON_FLAGS="--cores=$CORES --max-jobs=$CORES --substitute-urls='https://ci.guix.gnu.org https://bordeaux.guix.gnu.org https://hydra-guix-129.guix.gnu.org'" \
431-
./contrib/guix/guix-build
423+
ADDITIONAL_GUIX_COMMON_FLAGS="--cores=$CORES --max-jobs=$CORES" ./contrib/guix/guix-build
432424
- name: Prepare Files for Artifact
433425
run: |
434426
mkdir -p $ARTIFACT_DIR
@@ -439,12 +431,12 @@ jobs:
439431
name: guix-binaries-aarch64-linux-gnu
440432
path: ${{ env.ARTIFACT_DIR }}
441433
build-guix-x86_64-w64-mingw32:
442-
if: false
443434
name: build-guix-x86_64-w64-mingw32
444435
runs-on: ubuntu-22.04
445436
env:
446437
HOST: x86_64-w64-mingw32
447438
ARTIFACT_DIR: guix-binaries-x86_64-w64-mingw32
439+
SUBSTITUTE_URLS: "https://ci.guix.gnu.org https://bordeaux.guix.gnu.org https://hydra-guix-129.guix.gnu.org"
448440
steps:
449441
- name: Checkout
450442
uses: actions/checkout@v4
@@ -456,13 +448,12 @@ jobs:
456448
run: |
457449
sudo apt-get update
458450
sudo apt-get install -y guix
459-
guix pull --url=https://codeberg.org/guix/guix-mirror
451+
guix pull --url=https://codeberg.org/guix/guix-mirror --substitute-urls='https://ci.guix.gnu.org https://bordeaux.guix.gnu.org https://hydra-guix-129.guix.gnu.org'
460452
- name: Run Guix Build
461453
run: |
462454
CORES=$(nproc)
463455
env HOSTS="${HOST}" \
464-
ADDITIONAL_GUIX_COMMON_FLAGS="--cores=$CORES --max-jobs=$CORES --substitute-urls='https://ci.guix.gnu.org https://bordeaux.guix.gnu.org https://hydra-guix-129.guix.gnu.org'" \
465-
./contrib/guix/guix-build
456+
ADDITIONAL_GUIX_COMMON_FLAGS="--cores=$CORES --max-jobs=$CORES" ./contrib/guix/guix-build
466457
- name: Prepare Files for Artifact
467458
run: |
468459
mkdir -p $ARTIFACT_DIR
@@ -478,6 +469,7 @@ jobs:
478469
env:
479470
HOST: arm64-apple-darwin
480471
ARTIFACT_DIR: guix-binaries-arm64-apple-darwin
472+
SUBSTITUTE_URLS: "https://ci.guix.gnu.org https://bordeaux.guix.gnu.org https://hydra-guix-129.guix.gnu.org"
481473
steps:
482474
- name: Checkout
483475
uses: actions/checkout@v4
@@ -508,8 +500,7 @@ jobs:
508500
export SDK_PATH="$(pwd)/depends/SDKs"
509501
env HOSTS="${HOST}" \
510502
SDK_PATH="$SDK_PATH" \
511-
ADDITIONAL_GUIX_COMMON_FLAGS="--cores=$CORES --max-jobs=$CORES --substitute-urls='https://ci.guix.gnu.org https://bordeaux.guix.gnu.org https://hydra-guix-129.guix.gnu.org'" \
512-
./contrib/guix/guix-build
503+
ADDITIONAL_GUIX_COMMON_FLAGS="--cores=$CORES --max-jobs=$CORES" ./contrib/guix/guix-build
513504
- name: Prepare Files for Artifact
514505
run: |
515506
mkdir -p $ARTIFACT_DIR
@@ -525,6 +516,7 @@ jobs:
525516
env:
526517
HOST: x86_64-apple-darwin
527518
ARTIFACT_DIR: guix-binaries-x86_64-apple-darwin
519+
SUBSTITUTE_URLS: "https://ci.guix.gnu.org https://bordeaux.guix.gnu.org https://hydra-guix-129.guix.gnu.org"
528520
steps:
529521
- name: Checkout
530522
uses: actions/checkout@v4
@@ -553,10 +545,9 @@ jobs:
553545
run: |
554546
CORES=$(nproc)
555547
export SDK_PATH="$(pwd)/depends/SDKs"
556-
env HOSTS="{HOST}" \
548+
env HOSTS="${HOST}" \
557549
SDK_PATH="$SDK_PATH" \
558-
ADDITIONAL_GUIX_COMMON_FLAGS="--cores=$CORES --max-jobs=$CORES --substitute-urls='https://ci.guix.gnu.org https://bordeaux.guix.gnu.org https://hydra-guix-129.guix.gnu.org'" \
559-
./contrib/guix/guix-build
550+
ADDITIONAL_GUIX_COMMON_FLAGS="--cores=$CORES --max-jobs=$CORES" ./contrib/guix/guix-build
560551
- name: Prepare Files for Artifact
561552
run: |
562553
mkdir -p $ARTIFACT_DIR

‎contrib/guix/libexec/build.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ EOF
4141

4242
ACTUAL_OUTDIR="${OUTDIR}"
4343
OUTDIR="${DISTSRC}/output"
44-
DISTNAME="firo-${HOST}-${VERSION}"
4544

4645
# Use a fixed timestamp for depends builds so hashes match across commits that
4746
# don't make changes to the build system. This timestamp is only used for depends
@@ -398,6 +397,7 @@ mkdir -p "$DISTSRC"
398397
) # $DISTSRC
399398

400399
rm -rf "$ACTUAL_OUTDIR"
400+
echo "Moving $OUTDIR to $ACTUAL_OUTDIR"
401401
mv --no-target-directory "$OUTDIR" "$ACTUAL_OUTDIR" \
402402
|| ( rm -rf "$ACTUAL_OUTDIR" && exit 1 )
403403

‎contrib/guix/libexec/prelude.bash‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ time-machine() {
6565
# Set common variables
6666
################
6767

68-
VERSION="${FORCE_VERSION:-$(git_head_version)}"
68+
export VERSION="${FORCE_VERSION:-$(git_head_version)}"
6969
DISTNAME="${DISTNAME:-firo-${VERSION}}"
7070

7171
version_base_prefix="${PWD}/guix-build-"

‎contrib/guix/manifest.scm‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ chain for " target " development."))
102102
#:key
103103
(base-gcc-for-libc linux-base-gcc)
104104
(base-kernel-headers base-linux-kernel-headers)
105-
(base-libc glibc-2.31)
105+
(base-libc glibc-2.32)
106106
(base-gcc linux-base-gcc))
107107
"Convenience wrapper around MAKE-CROSS-TOOLCHAIN with default values
108108
desirable for building Bitcoin Core release binaries."
@@ -194,20 +194,20 @@ chain for " target " development."))
194194
(("-rpath=") "-rpath-link="))
195195
#t))))))))
196196

197-
(define-public glibc-2.31
198-
(let ((commit "7b27c450c34563a28e634cccb399cd415e71ebfe"))
197+
(define-public glibc-2.32
198+
(let ((commit "3de512be7ea6053255afed6154db9ee31d4e557a"))
199199
(package
200-
(inherit glibc) ;; 2.35
201-
(version "2.31")
200+
(inherit glibc) ;; 2.32
201+
(version "2.32")
202202
(source (origin
203203
(method git-fetch)
204204
(uri (git-reference
205-
(url "https://sourceware.org/git/glibc.git")
205+
(url "https://github.com/bminor/glibc")
206206
(commit commit)))
207207
(file-name (git-file-name "glibc" commit))
208208
(sha256
209209
(base32
210-
"017qdpr5id7ddb4lpkzj2li1abvw916m3fc6n7nw28z4h5qbv2n0"))
210+
"1175qgpbmfh3hl435p4myamncnbvvv69r3xann823hrmrhc31bc0"))
211211
(patches (search-our-patches "glibc-guix-prefix.patch"))))
212212
(arguments
213213
(substitute-keyword-arguments (package-arguments glibc)

0 commit comments

Comments
 (0)