Skip to content

Commit a60b7ee

Browse files
authored
Merge pull request #73 from curl/v8.12.0
prep v8.12.0
2 parents 8fa3dc0 + 3dff16c commit a60b7ee

8 files changed

+13
-8
lines changed

.github/workflows/build_ci_multi.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
uses: actions/checkout@v3
3434
- run: |
3535
sudo apt-get update
36-
sudo apt-get -y install buildah less git make podman qemu qemu-user-static clamav clamav-freshclam
36+
sudo apt-get -y install qemu-user-static buildah less git make podman clamav clamav-freshclam
3737
name: 'install dev deps'
3838
- run: buildah unshare make branch_or_ref=master release_tag=master multibuild
3939
name: 'build multi image'

.github/workflows/build_latest_release_multi.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
docker login -u ${{secrets.QUAY_USER}} -p ${{secrets.QUAY_TOKEN}} quay.io
4141
- run: |
4242
sudo apt-get update
43-
sudo apt-get -y install buildah less git make podman qemu qemu-user-static clamav clamav-freshclam
43+
sudo apt-get -y install qemu-user-static buildah less git make podman clamav clamav-freshclam
4444
name: 'install dev deps'
4545
- name: Sets env vars
4646
run: |

.github/workflows/build_master.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
docker login -u ${{secrets.QUAY_USER}} -p ${{secrets.QUAY_TOKEN}} quay.io
4444
- run: |
4545
sudo apt-get update
46-
sudo apt-get -y install buildah less git make podman qemu clamav clamav-freshclam
46+
sudo apt-get -y install qemu-user-static buildah less git make podman clamav clamav-freshclam
4747
name: 'install dev deps'
4848
- run: buildah unshare make branch_or_ref=master release_tag=master build_ref_images
4949
name: 'build master images'

.github/workflows/build_master_dev.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
docker login -u ${{secrets.QUAY_USER}} -p ${{secrets.QUAY_TOKEN}} quay.io
4444
- run: |
4545
sudo apt-get update
46-
sudo apt-get -y install buildah less git make podman qemu clamav clamav-freshclam
46+
sudo apt-get -y install qemu-user-static buildah less git make podman clamav clamav-freshclam
4747
name: 'install dev deps'
4848
- run: buildah unshare make branch_or_ref=master release_tag=master build_debian
4949
name: 'build debian dev image'

.github/workflows/build_master_multi.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
docker login -u ${{secrets.QUAY_USER}} -p ${{secrets.QUAY_TOKEN}} quay.io
4444
- run: |
4545
sudo apt-get update
46-
sudo apt-get -y install buildah less git make podman qemu qemu-user-static clamav clamav-freshclam
46+
sudo apt-get -y install qemu-user-static buildah less git make podman clamav clamav-freshclam
4747
name: 'install dev deps'
4848
- run: buildah unshare make branch_or_ref=master release_tag=master multibuild
4949
name: 'build multi image'

CHANGELOG.md

+5
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
66

77
## Unreleased
88

9+
## [8.12.0] - 2025-05-02
10+
### Changed
11+
- bump to curl 8.12.0
12+
- bump to alpine:3.21.2
13+
914
## [8.11.1] - 2024-12-11
1015
### Changed
1116
- bump to curl 8.11.1

Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ container_ids=`buildah ls --format "{{.ContainerID}}"`
55
# default setttings for official curl images
66
debian_base=docker.io/debian
77
fedora_base=docker.io/fedora
8-
base=docker.io/alpine:3.21.0
8+
base=docker.io/alpine:3.21.2
99
arch=""
1010
compiler="gcc"
1111
build_opts=" --enable-static --disable-ldap --enable-ipv6 --enable-unix-sockets -with-ssl --with-libssh2 --with-nghttp2=/usr --with-gssapi"
@@ -37,7 +37,7 @@ build_fedora:
3737
# > make branch_or_ref=master release_tag=master run_tests=1 build_arm64
3838
#
3939
build_arm64:
40-
./create_dev_image.sh "linux/arm" ${base} ${compiler} ${dev_deps} ${build_opts} ${branch_or_ref} curl-dev-linux-arm64:${release_tag} ${run_tests}
40+
./create_dev_image.sh "arm64" ${base} ${compiler} ${dev_deps} ${build_opts} ${branch_or_ref} curl-dev-linux-arm64:${release_tag} ${run_tests}
4141
# ./create_base_image.sh "linux/arm64" ${base} localhost/curl-dev-linux-arm64:${release_tag} ${base_deps} curl-base-linux-arm64:${release_tag} ${release_tag}
4242
# ./create_appliance_image.sh "linux/arm64" localhost/curl-base-linux-arm64:${release_tag} curl-linux-arm64:${release_tag} ${release_tag}
4343

VERSION

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
8.11.1
1+
8.12.0

0 commit comments

Comments
 (0)