Browse Source

Merge pull request #9207 from ThomasWaldmann/misc-updates-1.4

misc. updates (1.4-maint)
TW 6 days ago
parent
commit
400be5fcb5
2 changed files with 4 additions and 7 deletions
  1. 3 2
      .github/workflows/ci.yml
  2. 1 5
      docs/binaries/00_README.txt

+ 3 - 2
.github/workflows/ci.yml

@@ -148,7 +148,8 @@ jobs:
       TOXENV: ${{ matrix.toxenv }}
 
     runs-on: ${{ matrix.os }}
-    timeout-minutes: 180
+    # macOS machines can be slow, if overloaded.
+    timeout-minutes: 360
 
     steps:
     - uses: actions/checkout@v4
@@ -450,7 +451,7 @@ jobs:
       if: startsWith(github.ref, 'refs/tags/') && matrix.do_binaries
       uses: actions/upload-artifact@v4
       with:
-        name: ${{ matrix.os }}-${{ matrix.version }}-dist
+        name: ${{ matrix.artifact_prefix }}
         path: artifacts/*
         if-no-files-found: ignore
 

+ 1 - 5
docs/binaries/00_README.txt

@@ -37,17 +37,13 @@ borg-linux-glibc235-arm64-gh  Linux ARM (built on Ubuntu 22.04 LTS with glibc 2.
 borg-macos-14-arm64-gh        macOS Apple Silicon (built on macOS 14 w/o FUSE support)
 borg-macos-13-x86_64-gh       macOS Intel (built on macOS 13 w/o FUSE support)
 
+borg-freebsd-14-x86_64-gh     FreeBSD AMD/Intel (built on FreeBSD 14)
 
 Binaries built locally
 ~~~~~~~~~~~~~~~~~~~~~~
 
-borg-linux-glibc241-x86_64 Linux (built on Debian 13 "Trixie" with glibc 2.41)
-borg-linux-glibc236-x86_64 Linux (built on Debian 12 "Bookworm" with glibc 2.36)
 borg-linux-glibc231-x86_64 Linux (built on Debian 11 "Bullseye" with glibc 2.31)
 
-borg-freebsd-13-x86_64     FreeBSD (built on FreeBSD 13)
-borg-freebsd-14-x86_64     FreeBSD (built on FreeBSD 14)
-
 Note: if you don't find a specific binary here, check release 1.4.1 or 1.2.9.