diff --git a/.github/buildomat/jobs/build.sh b/.github/buildomat/jobs/build.sh index 5666b72..c01e70a 100644 --- a/.github/buildomat/jobs/build.sh +++ b/.github/buildomat/jobs/build.sh @@ -2,7 +2,7 @@ #: #: name = "build" #: variety = "basic" -#: target = "omnios-r151038" +#: target = "omnios-r151046" #: output_rules = [ #: "/work/tarballs/*", #: ] diff --git a/.github/workflows/build-deb-ubuntu.yml b/.github/workflows/build-deb-ubuntu.yml index 05015a1..7ce8038 100644 --- a/.github/workflows/build-deb-ubuntu.yml +++ b/.github/workflows/build-deb-ubuntu.yml @@ -2,21 +2,21 @@ name: build-deb-ubuntu on: [push] jobs: - build-2004: - runs-on: ubuntu-20.04 + build-2404: + runs-on: ubuntu-24.04 steps: - uses: actions/checkout@v2 - - run: sudo apt-get update && sudo apt-get install -y libpcsclite-dev libpcsclite1 libbsd-dev libbsd0 libedit-dev libreadline-dev libcryptsetup-dev libjson-c-dev libpam-dev devscripts fakeroot debhelper ragel + - run: sudo apt-get update && sudo apt-get install -y libpcsclite-dev libpcsclite1 libbsd-dev libbsd0 libedit-dev libreadline-dev libcryptsetup-dev libjson-c-dev libpam-dev build-essential devscripts fakeroot debhelper ragel - run: make && make deb && mv ../*.deb ./ - uses: actions/upload-artifact@v3 with: - name: ubuntu-2004 + name: ubuntu-2404 path: '*.deb' build-2204: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v2 - - run: sudo apt-get update && sudo apt-get install -y libpcsclite-dev libpcsclite1 libbsd-dev libbsd0 libedit-dev libreadline-dev libcryptsetup-dev libjson-c-dev libpam-dev devscripts fakeroot debhelper ragel + - run: sudo apt-get update && sudo apt-get install -y libpcsclite-dev libpcsclite1 libbsd-dev libbsd0 libedit-dev libreadline-dev libcryptsetup-dev libjson-c-dev libpam-dev build-essential devscripts fakeroot debhelper ragel - run: make && make deb && mv ../*.deb ./ - uses: actions/upload-artifact@v3 with: diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml index 92d5c34..51aa520 100644 --- a/.github/workflows/build-macos.yml +++ b/.github/workflows/build-macos.yml @@ -2,7 +2,7 @@ name: build-macos on: [push] jobs: - build-macos11: + build-macos12: runs-on: macos-12 steps: - uses: actions/checkout@v2 diff --git a/Makefile b/Makefile index c6a92be..c863def 100644 --- a/Makefile +++ b/Makefile @@ -748,7 +748,7 @@ endif touch $(CURDIR)/$@ OPENSSH_CONFIG_ARGS= \ - --disable-security-key \ + --disable-security-key \ --disable-pkcs11 .openssh.configure: .openssh.patch $(LIBCRYPTO)