diff options
| -rw-r--r-- | .github/workflows/macos.yml | 2 | ||||
| -rwxr-xr-x | update.sh | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index ac29bc0..0c344e5 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml | |||
| @@ -21,7 +21,7 @@ jobs: | |||
| 21 | strategy: | 21 | strategy: |
| 22 | fail-fast: false | 22 | fail-fast: false |
| 23 | matrix: | 23 | matrix: |
| 24 | os: ["macos-15", "macos-14", "macos-13"] | 24 | os: ["macos-15", "macos-14"] |
| 25 | arch: ["arm64", "x86_64"] | 25 | arch: ["arm64", "x86_64"] |
| 26 | steps: | 26 | steps: |
| 27 | - name: "Install required packages" | 27 | - name: "Install required packages" |
| @@ -21,7 +21,7 @@ openbsd_branch=`cat OPENBSD_BRANCH` | |||
| 21 | # pull in latest upstream code | 21 | # pull in latest upstream code |
| 22 | echo "pulling upstream openbsd source" | 22 | echo "pulling upstream openbsd source" |
| 23 | if [ ! -d openbsd ]; then | 23 | if [ ! -d openbsd ]; then |
| 24 | LIBRESSL_GIT_OPTIONS="${LIBRESSL_GIT_OPTIONS:- --depth=8}" | 24 | LIBRESSL_GIT_OPTIONS="${LIBRESSL_GIT_OPTIONS:- --depth=8 --no-single-branch}" |
| 25 | LIBRESSL_GIT="${LIBRESSL_GIT:- https://github.com/libressl}" | 25 | LIBRESSL_GIT="${LIBRESSL_GIT:- https://github.com/libressl}" |
| 26 | git clone $LIBRESSL_GIT_OPTIONS $LIBRESSL_GIT/openbsd | 26 | git clone $LIBRESSL_GIT_OPTIONS $LIBRESSL_GIT/openbsd |
| 27 | fi | 27 | fi |
| @@ -32,7 +32,7 @@ tag=`git describe --exact-match --tags HEAD 2>/dev/null` | |||
| 32 | is_tag=$? | 32 | is_tag=$? |
| 33 | # adjust for 9 hour time delta between trees | 33 | # adjust for 9 hour time delta between trees |
| 34 | release_ts=$((`git show -s --format=%ct $tag|tail -1` + 32400)) | 34 | release_ts=$((`git show -s --format=%ct $tag|tail -1` + 32400)) |
| 35 | commit=`git -C openbsd rev-list -n 1 --before=$release_ts $openbsd_branch` | 35 | commit=`git -C openbsd rev-list -n 1 --before=$release_ts origin/$openbsd_branch` |
| 36 | git -C openbsd fetch | 36 | git -C openbsd fetch |
| 37 | if [ $is_tag -eq 0 ]; then | 37 | if [ $is_tag -eq 0 ]; then |
| 38 | echo "This is tag $tag, trying OpenBSD tag libressl-$tag" | 38 | echo "This is tag $tag, trying OpenBSD tag libressl-$tag" |
