From b315ba1c94cad85a3dfa1d15264f525e1ca176a4 Mon Sep 17 00:00:00 2001 From: Mike Brady <4265913+mikebrady@users.noreply.github.com> Date: Mon, 27 Jan 2025 14:31:17 +0000 Subject: [PATCH 01/18] start of 4.3.7-dev --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 6dacd287..33bee008 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ([2.50]) -AC_INIT([shairport-sync], [4.3.6-dev], [4265913+mikebrady@users.noreply.github.com]) +AC_INIT([shairport-sync], [4.3.7-dev], [4265913+mikebrady@users.noreply.github.com]) AM_INIT_AUTOMAKE([subdir-objects]) AC_CONFIG_SRCDIR([shairport.c]) AC_CONFIG_HEADERS([config.h]) From 3c688af2e1d47d573507df34e5e293ef672c97b1 Mon Sep 17 00:00:00 2001 From: Mike Brady <4265913+mikebrady@users.noreply.github.com> Date: Mon, 27 Jan 2025 14:38:50 +0000 Subject: [PATCH 02/18] Update RELEASENOTES-DEVELOPMENT.md --- RELEASENOTES-DEVELOPMENT.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/RELEASENOTES-DEVELOPMENT.md b/RELEASENOTES-DEVELOPMENT.md index 514ca6f3..4458ff42 100644 --- a/RELEASENOTES-DEVELOPMENT.md +++ b/RELEASENOTES-DEVELOPMENT.md @@ -1,4 +1,8 @@ -Version 4.3.6-dev-24-g015a5829 +Version 4.3.7-dev +== +* This is effectively Version 4.3.6-dev-24-g015a5829, which is also effectively Version 4.3.6. + +Version 4.3.6-dev-24-g015a5829 == **MQTT Documentation Addition** From 194c6b3fec38f10d842400c35093c6bd2ce6572f Mon Sep 17 00:00:00 2001 From: Mike Brady <4265913+mikebrady@users.noreply.github.com> Date: Mon, 27 Jan 2025 15:01:39 +0000 Subject: [PATCH 03/18] Update docker-build-on-push_and_pull_request.yaml --- .github/workflows/docker-build-on-push_and_pull_request.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-build-on-push_and_pull_request.yaml b/.github/workflows/docker-build-on-push_and_pull_request.yaml index 01df710d..c55053f9 100644 --- a/.github/workflows/docker-build-on-push_and_pull_request.yaml +++ b/.github/workflows/docker-build-on-push_and_pull_request.yaml @@ -22,7 +22,7 @@ env: jobs: test-build-on-pull-request: if: github.event_name == 'pull_request' - runs-on: ubuntu-latest + runs-on: ubuntu-24.04-arm steps: - name: Checkout Repo uses: actions/checkout@v3 From 802058fe15c7066df9f8078fd96247f00aa73904 Mon Sep 17 00:00:00 2001 From: Mike Brady <4265913+mikebrady@users.noreply.github.com> Date: Mon, 27 Jan 2025 15:13:54 +0000 Subject: [PATCH 04/18] Update docker-build-on-push_and_pull_request.yaml --- .github/workflows/docker-build-on-push_and_pull_request.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-build-on-push_and_pull_request.yaml b/.github/workflows/docker-build-on-push_and_pull_request.yaml index c55053f9..4fd15fb5 100644 --- a/.github/workflows/docker-build-on-push_and_pull_request.yaml +++ b/.github/workflows/docker-build-on-push_and_pull_request.yaml @@ -64,7 +64,7 @@ jobs: build-and-publish: if: github.event_name != 'pull_request' - runs-on: ubuntu-latest + runs-on: ubuntu-24.04-arm steps: - name: Checkout uses: actions/checkout@v3.5.2 From 0137515670b6795441de244a20da29e1d1bd0f78 Mon Sep 17 00:00:00 2001 From: Mike Brady <4265913+mikebrady@users.noreply.github.com> Date: Tue, 28 Jan 2025 06:36:46 +0000 Subject: [PATCH 05/18] Add "curl" to the Docker images for potential use in automations. --- docker/Dockerfile | 3 ++- docker/classic/Dockerfile | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 165b1c0e..aff083bd 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -117,7 +117,8 @@ RUN apk -U add \ mandoc \ mosquitto \ popt \ - soxr && \ + soxr \ + curl && \ rm -rfv /lib/apk/db/* && \ rm -rfv /etc/avahi/services/*.service && \ addgroup shairport-sync && \ diff --git a/docker/classic/Dockerfile b/docker/classic/Dockerfile index ef26d5d9..33ce58ed 100644 --- a/docker/classic/Dockerfile +++ b/docker/classic/Dockerfile @@ -71,7 +71,8 @@ RUN apk -U add \ mbedtls \ mosquitto \ popt \ - soxr + soxr \ + curl # Copy build files. COPY --from=builder /shairport-sync/build/install/usr/local/bin/shairport-sync /usr/local/bin/shairport-sync From e4aaeb56f0b6fcb9ba05a42439d075a8596baa41 Mon Sep 17 00:00:00 2001 From: Mike Brady <4265913+mikebrady@users.noreply.github.com> Date: Tue, 28 Jan 2025 06:41:34 +0000 Subject: [PATCH 06/18] Update docker-build-on-push_and_pull_request.yaml --- .../docker-build-on-push_and_pull_request.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/docker-build-on-push_and_pull_request.yaml b/.github/workflows/docker-build-on-push_and_pull_request.yaml index 4fd15fb5..9e5b4a6e 100644 --- a/.github/workflows/docker-build-on-push_and_pull_request.yaml +++ b/.github/workflows/docker-build-on-push_and_pull_request.yaml @@ -8,12 +8,12 @@ name: Build and push docker (push/pull request) on: workflow_dispatch: - push: - branches: - - master - - development - pull_request: - types: [opened, synchronize, reopened, ready_for_review] + # push: + # branches: + # - master + # - development + # pull_request: + # types: [opened, synchronize, reopened, ready_for_review] env: DOCKER_PLATFORMS: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64 From 76e7bb69cc7a084c8cb0b2da519918e879274a2b Mon Sep 17 00:00:00 2001 From: Mike Brady <4265913+mikebrady@users.noreply.github.com> Date: Tue, 28 Jan 2025 06:41:53 +0000 Subject: [PATCH 07/18] Update docker-build-on-tag.yaml --- .github/workflows/docker-build-on-tag.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/docker-build-on-tag.yaml b/.github/workflows/docker-build-on-tag.yaml index 5c918777..ea69aa8b 100644 --- a/.github/workflows/docker-build-on-tag.yaml +++ b/.github/workflows/docker-build-on-tag.yaml @@ -9,11 +9,11 @@ name: Build and push docker (tag) on: workflow_dispatch: - push: - tags: - - '[0-9]+' # X - - '[0-9]+\.[0-9]+' # X.Y - - '[0-9]+\.[0-9]+\.[0-9]+' # X.Y.Z + # push: + # tags: + # - '[0-9]+' # X + # - '[0-9]+\.[0-9]+' # X.Y + # - '[0-9]+\.[0-9]+\.[0-9]+' # X.Y.Z env: DOCKER_PLATFORMS: linux/386,linux/amd64,linux/arm/v6,linux/arm64,linux/arm/v7 From 35d58317d44a491bd54b86b39aa9cb533c92bae1 Mon Sep 17 00:00:00 2001 From: Mike Brady <4265913+mikebrady@users.noreply.github.com> Date: Tue, 28 Jan 2025 07:00:01 +0000 Subject: [PATCH 08/18] Update RELEASENOTES-DEVELOPMENT.md --- RELEASENOTES-DEVELOPMENT.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/RELEASENOTES-DEVELOPMENT.md b/RELEASENOTES-DEVELOPMENT.md index 4458ff42..67dcdfe4 100644 --- a/RELEASENOTES-DEVELOPMENT.md +++ b/RELEASENOTES-DEVELOPMENT.md @@ -1,3 +1,9 @@ +Version 4.3.7-dev-3-g802058fe +== +**Docker Enhancement** + +* Add `curl` to the Docker images to facilitate automations. Thanks to [ironcrafter54](https://github.com/ironcrafter54) for the [suggestion](https://github.com/mikebrady/shairport-sync/discussions/1960). + Version 4.3.7-dev == * This is effectively Version 4.3.6-dev-24-g015a5829, which is also effectively Version 4.3.6. From 08063e6d5001d8a9d293ed351107f485690450aa Mon Sep 17 00:00:00 2001 From: Mike Brady <4265913+mikebrady@users.noreply.github.com> Date: Tue, 28 Jan 2025 10:00:56 +0000 Subject: [PATCH 09/18] Add default parameter to the classic Dockerfile. --- docker/classic/Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docker/classic/Dockerfile b/docker/classic/Dockerfile index 33ce58ed..f9b91d6a 100644 --- a/docker/classic/Dockerfile +++ b/docker/classic/Dockerfile @@ -1,3 +1,5 @@ +ARG SHAIRPORT_SYNC_BRANCH=. + FROM alpine:3.17 AS builder # Classic (aka AirPlay 1) Build From e0e3c45367614241f4745adf02e85edd2120040d Mon Sep 17 00:00:00 2001 From: Charles Date: Tue, 28 Jan 2025 18:55:35 +0000 Subject: [PATCH 10/18] Docker updates. Github action updates. Fix for github actions. --- ...docker-build-on-push_and_pull_request.yaml | 38 +++++++++---------- .github/workflows/docker-build-on-tag.yaml | 16 ++++---- docker/Dockerfile | 16 ++++---- docker/classic/Dockerfile | 6 +-- 4 files changed, 39 insertions(+), 37 deletions(-) diff --git a/.github/workflows/docker-build-on-push_and_pull_request.yaml b/.github/workflows/docker-build-on-push_and_pull_request.yaml index 9e5b4a6e..f12fb88e 100644 --- a/.github/workflows/docker-build-on-push_and_pull_request.yaml +++ b/.github/workflows/docker-build-on-push_and_pull_request.yaml @@ -8,12 +8,12 @@ name: Build and push docker (push/pull request) on: workflow_dispatch: - # push: - # branches: - # - master - # - development - # pull_request: - # types: [opened, synchronize, reopened, ready_for_review] + push: + branches: + - master + - development + pull_request: + types: [opened, synchronize, reopened, ready_for_review] env: DOCKER_PLATFORMS: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64 @@ -22,10 +22,10 @@ env: jobs: test-build-on-pull-request: if: github.event_name == 'pull_request' - runs-on: ubuntu-24.04-arm + runs-on: ubuntu-22.04 steps: - name: Checkout Repo - uses: actions/checkout@v3 + uses: actions/checkout@v4.2.2 with: fetch-depth: 0 ref: ${{github.event.pull_request.head.ref}} @@ -38,13 +38,13 @@ jobs: echo "SHAIRPORT_SYNC_BRANCH=${SHAIRPORT_SYNC_BRANCH}" >> $GITHUB_ENV - name: Set up QEMU - uses: docker/setup-qemu-action@v2.1.0 + uses: docker/setup-qemu-action@v3.3.0 - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2.5.0 + uses: docker/setup-buildx-action@v3.8.0 - name: Build (classic) - uses: docker/build-push-action@v4.0.0 + uses: docker/build-push-action@v6.13.0 with: context: ./ file: ./docker/classic/Dockerfile @@ -53,7 +53,7 @@ jobs: SHAIRPORT_SYNC_BRANCH=${{ env.SHAIRPORT_SYNC_BRANCH }} - name: Build - uses: docker/build-push-action@v4.0.0 + uses: docker/build-push-action@v6.13.0 with: context: ./ file: ./docker/Dockerfile @@ -64,10 +64,10 @@ jobs: build-and-publish: if: github.event_name != 'pull_request' - runs-on: ubuntu-24.04-arm + runs-on: ubuntu-22.04 steps: - name: Checkout - uses: actions/checkout@v3.5.2 + uses: actions/checkout@v4.2.2 with: fetch-depth: 0 @@ -86,20 +86,20 @@ jobs: echo "IMAGE_TAG_BASE=development" >> $GITHUB_ENV - name: Set up QEMU - uses: docker/setup-qemu-action@v2.1.0 + uses: docker/setup-qemu-action@v3.3.0 - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2.5.0 + uses: docker/setup-buildx-action@v3.8.0 - name: Login to Docker Registry - uses: docker/login-action@v2.1.0 + uses: docker/login-action@v3.3.0 with: registry: ${{ secrets.DOCKER_REGISTRY }} username: ${{ secrets.DOCKER_REGISTRY_USER }} password: ${{ secrets.DOCKER_REGISTRY_TOKEN }} - name: Build and push (classic) - uses: docker/build-push-action@v4.0.0 + uses: docker/build-push-action@v6.13.0 with: context: ./ file: ./docker/classic/Dockerfile @@ -110,7 +110,7 @@ jobs: SHAIRPORT_SYNC_BRANCH=${{ env.SHAIRPORT_SYNC_BRANCH }} - name: Build and push - uses: docker/build-push-action@v4.0.0 + uses: docker/build-push-action@v6.13.0 with: context: ./ file: ./docker/Dockerfile diff --git a/.github/workflows/docker-build-on-tag.yaml b/.github/workflows/docker-build-on-tag.yaml index ea69aa8b..71c549ad 100644 --- a/.github/workflows/docker-build-on-tag.yaml +++ b/.github/workflows/docker-build-on-tag.yaml @@ -1,19 +1,19 @@ -# Builds & pushes a docker image when a tag is created. +# Builds & pushes a docker image when a tag is created. # Tag pattern: '[tag]' & '[tag]-classic' # 'latest' & 'classic' also, when master tagged. # Only pushes the tag when it matches one of the following patterns: -# X, X.Y or X.Y.Z +# X, X.Y or X.Y.Z name: Build and push docker (tag) on: workflow_dispatch: - # push: - # tags: - # - '[0-9]+' # X - # - '[0-9]+\.[0-9]+' # X.Y - # - '[0-9]+\.[0-9]+\.[0-9]+' # X.Y.Z + push: + tags: + - '[0-9]+' # X + - '[0-9]+\.[0-9]+' # X.Y + - '[0-9]+\.[0-9]+\.[0-9]+' # X.Y.Z env: DOCKER_PLATFORMS: linux/386,linux/amd64,linux/arm/v6,linux/arm64,linux/arm/v7 @@ -21,7 +21,7 @@ env: jobs: main: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - name: Checkout uses: actions/checkout@v3.5.2 diff --git a/docker/Dockerfile b/docker/Dockerfile index aff083bd..d432a792 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,7 +1,7 @@ ARG NQPTP_BRANCH=main ARG SHAIRPORT_SYNC_BRANCH=. -FROM alpine:3.17 AS builder +FROM alpine:3.20 AS builder RUN apk -U add \ alsa-lib-dev \ @@ -32,7 +32,7 @@ RUN git clone --depth=1 https://github.com/mikebrady/alac WORKDIR /alac RUN autoreconf -i RUN ./configure -RUN make +RUN make -j $(nproc) RUN make install WORKDIR / ##### ALAC END ##### @@ -44,7 +44,7 @@ RUN git clone --depth=1 -b "$NQPTP_BRANCH" https://github.com/mikebrady/nqptp WORKDIR /nqptp RUN autoreconf -i RUN ./configure -RUN make +RUN make -j $(nproc) WORKDIR / ##### NQPTP END ##### @@ -90,7 +90,7 @@ COPY --from=shairport-sync /shairport-sync/build/install/etc/dbus-1/system.d/sha ##### END BUILD FILES ##### # Shairport Sync Runtime System -FROM crazymax/alpine-s6:3.17-3.1.1.2 +FROM crazymax/alpine-s6:3.20-3.2.0.2 ENV S6_CMD_WAIT_FOR_SERVICES=1 ENV S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 @@ -108,7 +108,7 @@ RUN apk -U add \ libgcrypt \ libplist \ libpulse \ - libressl3.6-libcrypto \ + libressl3.8-libcrypto \ libsndfile \ libsodium \ libuuid \ @@ -118,8 +118,10 @@ RUN apk -U add \ mosquitto \ popt \ soxr \ - curl && \ - rm -rfv /lib/apk/db/* && \ + curl \ + dhclient + +RUN rm -rfv /lib/apk/db/* && \ rm -rfv /etc/avahi/services/*.service && \ addgroup shairport-sync && \ adduser -D shairport-sync -G shairport-sync && \ diff --git a/docker/classic/Dockerfile b/docker/classic/Dockerfile index f9b91d6a..a37b3785 100644 --- a/docker/classic/Dockerfile +++ b/docker/classic/Dockerfile @@ -1,6 +1,6 @@ ARG SHAIRPORT_SYNC_BRANCH=. -FROM alpine:3.17 AS builder +FROM alpine:3.20 AS builder # Classic (aka AirPlay 1) Build @@ -31,7 +31,7 @@ RUN git clone https://github.com/mikebrady/alac WORKDIR /alac RUN autoreconf -i RUN ./configure -RUN make +RUN make -j $(nproc) RUN make install WORKDIR / ##### ALAC END ##### @@ -52,7 +52,7 @@ WORKDIR / ##### SPS END ##### # Shairport Sync Runtime System -FROM crazymax/alpine-s6:3.17-3.1.1.2 +FROM crazymax/alpine-s6:3.20-3.2.0.2 ENV S6_CMD_WAIT_FOR_SERVICES=1 ENV S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 From de51d4c5bf014491c0887bb5c0ce43b838efec7a Mon Sep 17 00:00:00 2001 From: Mike Brady <4265913+mikebrady@users.noreply.github.com> Date: Fri, 31 Jan 2025 11:15:46 +0000 Subject: [PATCH 11/18] Update RELEASENOTES-DEVELOPMENT.md --- RELEASENOTES-DEVELOPMENT.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/RELEASENOTES-DEVELOPMENT.md b/RELEASENOTES-DEVELOPMENT.md index 67dcdfe4..6b752bf8 100644 --- a/RELEASENOTES-DEVELOPMENT.md +++ b/RELEASENOTES-DEVELOPMENT.md @@ -1,3 +1,9 @@ +Version 4.3.7-dev-11-g7367d042 +== +**Automated Docker Build Fixes** + +* Thanks to [Charles Omer](https://github.com/charlesomer) for [fixes](https://github.com/mikebrady/shairport-sync/pull/1961) to the Github Action scripts for building and pushing Docker images. + Version 4.3.7-dev-3-g802058fe == **Docker Enhancement** From 5571e4df1b997d0b347f39de410c7857db4f0ca8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 31 Jan 2025 12:19:23 +0000 Subject: [PATCH 12/18] Bump actions/checkout from 3.5.2 to 4.2.2 Bumps [actions/checkout](https://github.com/actions/checkout) from 3.5.2 to 4.2.2. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v3.5.2...v4.2.2) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/check_ap2_systemd_basic.yml | 2 +- .github/workflows/check_ap2_systemd_full.yml | 2 +- .github/workflows/check_ap2_systemd_full_build_folder.yml | 2 +- .github/workflows/check_ap2_systemv_full.yml | 2 +- .github/workflows/check_classic_mac_basic.yml | 2 +- .github/workflows/check_classic_systemd_basic.yml | 2 +- .github/workflows/check_classic_systemd_full.yml | 2 +- .github/workflows/docker-build-on-tag.yaml | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/check_ap2_systemd_basic.yml b/.github/workflows/check_ap2_systemd_basic.yml index 381d39a1..bfdb81c0 100644 --- a/.github/workflows/check_ap2_systemd_basic.yml +++ b/.github/workflows/check_ap2_systemd_basic.yml @@ -13,7 +13,7 @@ jobs: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v4.2.2 - name: Install Dependencies run: sudo apt-get -y --no-install-recommends install xmltoman libpopt-dev libconfig-dev libasound2-dev avahi-daemon libavahi-client-dev libsoxr-dev libplist-dev libsodium-dev libavutil-dev libavcodec-dev libavformat-dev - name: Configure diff --git a/.github/workflows/check_ap2_systemd_full.yml b/.github/workflows/check_ap2_systemd_full.yml index 549b904b..adf95e83 100644 --- a/.github/workflows/check_ap2_systemd_full.yml +++ b/.github/workflows/check_ap2_systemd_full.yml @@ -13,7 +13,7 @@ jobs: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v4.2.2 - name: Install Dependencies run: sudo apt-get -y --no-install-recommends install xmltoman libpopt-dev libconfig-dev libasound2-dev libao-dev libjack-dev libmosquitto-dev avahi-daemon libavahi-client-dev libsoxr-dev libplist-dev libsodium-dev libavutil-dev libavcodec-dev libavformat-dev - name: Configure diff --git a/.github/workflows/check_ap2_systemd_full_build_folder.yml b/.github/workflows/check_ap2_systemd_full_build_folder.yml index 4e82666c..3db40e1d 100644 --- a/.github/workflows/check_ap2_systemd_full_build_folder.yml +++ b/.github/workflows/check_ap2_systemd_full_build_folder.yml @@ -13,7 +13,7 @@ jobs: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@v3.5.2 + - uses: actions/checkout@v4.2.2 - name: Install Dependencies run: sudo apt-get -y --no-install-recommends install xmltoman libpopt-dev libconfig-dev libasound2-dev libao-dev libjack-dev libglib2.0-dev libmosquitto-dev avahi-daemon libavahi-client-dev libssl-dev libsoxr-dev libplist-dev libsodium-dev libavutil-dev libavcodec-dev libavformat-dev - name: Configure diff --git a/.github/workflows/check_ap2_systemv_full.yml b/.github/workflows/check_ap2_systemv_full.yml index 0665e836..c19b0940 100644 --- a/.github/workflows/check_ap2_systemv_full.yml +++ b/.github/workflows/check_ap2_systemv_full.yml @@ -13,7 +13,7 @@ jobs: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v4.2.2 - name: Install Dependencies run: sudo apt-get -y --no-install-recommends install xmltoman libpopt-dev libdaemon-dev libconfig-dev libasound2-dev libao-dev libjack-dev libglib2.0-dev libmosquitto-dev avahi-daemon libavahi-client-dev libssl-dev libsoxr-dev libplist-dev libsodium-dev libavutil-dev libavcodec-dev libavformat-dev uuid-dev libgcrypt-dev - name: Configure diff --git a/.github/workflows/check_classic_mac_basic.yml b/.github/workflows/check_classic_mac_basic.yml index 038ded2e..f58b4e19 100644 --- a/.github/workflows/check_classic_mac_basic.yml +++ b/.github/workflows/check_classic_mac_basic.yml @@ -13,7 +13,7 @@ jobs: runs-on: macos-13 steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v4.2.2 - name: Install Dependencies run: | brew install automake diff --git a/.github/workflows/check_classic_systemd_basic.yml b/.github/workflows/check_classic_systemd_basic.yml index c28cd6f7..6276e4b4 100644 --- a/.github/workflows/check_classic_systemd_basic.yml +++ b/.github/workflows/check_classic_systemd_basic.yml @@ -13,7 +13,7 @@ jobs: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v4.2.2 - name: Install Dependencies run: sudo apt-get -y --no-install-recommends install xmltoman libpopt-dev libconfig-dev libasound2-dev avahi-daemon libavahi-client-dev libssl-dev libsoxr-dev - name: Configure diff --git a/.github/workflows/check_classic_systemd_full.yml b/.github/workflows/check_classic_systemd_full.yml index ea153e96..5850edc6 100644 --- a/.github/workflows/check_classic_systemd_full.yml +++ b/.github/workflows/check_classic_systemd_full.yml @@ -13,7 +13,7 @@ jobs: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v4.2.2 - name: Install Dependencies run: sudo apt-get -y --no-install-recommends install xmltoman libpopt-dev libconfig-dev libasound2-dev libao-dev libjack-dev libglib2.0-dev libmosquitto-dev avahi-daemon libavahi-client-dev libssl-dev libsoxr-dev - name: Configure diff --git a/.github/workflows/docker-build-on-tag.yaml b/.github/workflows/docker-build-on-tag.yaml index 71c549ad..7ebc3048 100644 --- a/.github/workflows/docker-build-on-tag.yaml +++ b/.github/workflows/docker-build-on-tag.yaml @@ -24,7 +24,7 @@ jobs: runs-on: ubuntu-22.04 steps: - name: Checkout - uses: actions/checkout@v3.5.2 + uses: actions/checkout@v4.2.2 with: fetch-depth: 0 From dba0ab603a8144a36ef7e1a220aef7ae1168fa9a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 31 Jan 2025 12:19:26 +0000 Subject: [PATCH 13/18] Bump actions/stale from 8.0.0 to 9.1.0 Bumps [actions/stale](https://github.com/actions/stale) from 8.0.0 to 9.1.0. - [Release notes](https://github.com/actions/stale/releases) - [Changelog](https://github.com/actions/stale/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/stale/compare/v8.0.0...v9.1.0) --- updated-dependencies: - dependency-name: actions/stale dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/stale.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/stale.yaml b/.github/workflows/stale.yaml index 88a0d50a..c2a0a3a2 100644 --- a/.github/workflows/stale.yaml +++ b/.github/workflows/stale.yaml @@ -11,7 +11,7 @@ jobs: stale: runs-on: ubuntu-latest steps: - - uses: actions/stale@v8.0.0 + - uses: actions/stale@v9.1.0 with: stale-issue-message: 'This issue has been inactive for 28 days so will be closed 7 days from now. To prevent this, please remove the "stale" label or post a comment.' stale-pr-message: 'This PR has been inactive for 28 days so will be closed 7 days from now. To prevent this, please remove the "stale" label or post a comment.' From e07642e3e300be2e9bac695d34e46b1608286a06 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 31 Jan 2025 12:19:28 +0000 Subject: [PATCH 14/18] Bump docker/setup-qemu-action from 2.1.0 to 3.3.0 Bumps [docker/setup-qemu-action](https://github.com/docker/setup-qemu-action) from 2.1.0 to 3.3.0. - [Release notes](https://github.com/docker/setup-qemu-action/releases) - [Commits](https://github.com/docker/setup-qemu-action/compare/v2.1.0...v3.3.0) --- updated-dependencies: - dependency-name: docker/setup-qemu-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/docker-build-on-tag.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-build-on-tag.yaml b/.github/workflows/docker-build-on-tag.yaml index 71c549ad..36cabf8c 100644 --- a/.github/workflows/docker-build-on-tag.yaml +++ b/.github/workflows/docker-build-on-tag.yaml @@ -47,7 +47,7 @@ jobs: echo "NQPTP_BRANCH=development" >> $GITHUB_ENV - name: Set up QEMU - uses: docker/setup-qemu-action@v2.1.0 + uses: docker/setup-qemu-action@v3.3.0 - name: Set up Docker Buildx uses: docker/setup-buildx-action@v2.5.0 From 336b09e29b375024d250695e4bb8a018ebb43ebf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 31 Jan 2025 12:19:31 +0000 Subject: [PATCH 15/18] Bump docker/build-push-action from 4.0.0 to 6.13.0 Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 4.0.0 to 6.13.0. - [Release notes](https://github.com/docker/build-push-action/releases) - [Commits](https://github.com/docker/build-push-action/compare/v4...v6.13.0) --- updated-dependencies: - dependency-name: docker/build-push-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/docker-build-on-tag.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker-build-on-tag.yaml b/.github/workflows/docker-build-on-tag.yaml index 71c549ad..161547f7 100644 --- a/.github/workflows/docker-build-on-tag.yaml +++ b/.github/workflows/docker-build-on-tag.yaml @@ -60,7 +60,7 @@ jobs: password: ${{ secrets.DOCKER_REGISTRY_TOKEN }} - name: Build and push (classic) - uses: docker/build-push-action@v4.0.0 + uses: docker/build-push-action@v6.13.0 with: context: ./ file: ./docker/classic/Dockerfile @@ -73,7 +73,7 @@ jobs: SHAIRPORT_SYNC_BRANCH=${{ env.SHAIRPORT_SYNC_BRANCH }} - name: Build and push - uses: docker/build-push-action@v4.0.0 + uses: docker/build-push-action@v6.13.0 with: context: ./ file: ./docker/Dockerfile From 58abfd1922479f47c7f11e5750406802643f0ded Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 31 Jan 2025 12:19:33 +0000 Subject: [PATCH 16/18] Bump docker/login-action from 2.1.0 to 3.3.0 Bumps [docker/login-action](https://github.com/docker/login-action) from 2.1.0 to 3.3.0. - [Release notes](https://github.com/docker/login-action/releases) - [Commits](https://github.com/docker/login-action/compare/v2.1.0...v3.3.0) --- updated-dependencies: - dependency-name: docker/login-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/docker-build-on-tag.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-build-on-tag.yaml b/.github/workflows/docker-build-on-tag.yaml index 71c549ad..929491ea 100644 --- a/.github/workflows/docker-build-on-tag.yaml +++ b/.github/workflows/docker-build-on-tag.yaml @@ -53,7 +53,7 @@ jobs: uses: docker/setup-buildx-action@v2.5.0 - name: Login to Docker Registry - uses: docker/login-action@v2.1.0 + uses: docker/login-action@v3.3.0 with: registry: ${{ secrets.DOCKER_REGISTRY }} username: ${{ secrets.DOCKER_REGISTRY_USER }} From fbfdc64c6d2159578b48172e7520c7838808de65 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 31 Jan 2025 12:19:36 +0000 Subject: [PATCH 17/18] Bump docker/setup-buildx-action from 2.5.0 to 3.8.0 Bumps [docker/setup-buildx-action](https://github.com/docker/setup-buildx-action) from 2.5.0 to 3.8.0. - [Release notes](https://github.com/docker/setup-buildx-action/releases) - [Commits](https://github.com/docker/setup-buildx-action/compare/v2.5.0...v3.8.0) --- updated-dependencies: - dependency-name: docker/setup-buildx-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/docker-build-on-tag.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-build-on-tag.yaml b/.github/workflows/docker-build-on-tag.yaml index 71c549ad..c74d9ed6 100644 --- a/.github/workflows/docker-build-on-tag.yaml +++ b/.github/workflows/docker-build-on-tag.yaml @@ -50,7 +50,7 @@ jobs: uses: docker/setup-qemu-action@v2.1.0 - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2.5.0 + uses: docker/setup-buildx-action@v3.8.0 - name: Login to Docker Registry uses: docker/login-action@v2.1.0 From 9b3f6f816d2fe9177812401f6bae0a7e82a0a99c Mon Sep 17 00:00:00 2001 From: Mike Brady <4265913+mikebrady@users.noreply.github.com> Date: Fri, 31 Jan 2025 13:15:36 +0000 Subject: [PATCH 18/18] Update RELEASENOTES-DEVELOPMENT.md --- RELEASENOTES-DEVELOPMENT.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/RELEASENOTES-DEVELOPMENT.md b/RELEASENOTES-DEVELOPMENT.md index 6b752bf8..5b45e33e 100644 --- a/RELEASENOTES-DEVELOPMENT.md +++ b/RELEASENOTES-DEVELOPMENT.md @@ -1,3 +1,8 @@ +Version 4.3.7-dev-24-gbc5001eb +== +**Dependabot Updates** +* A number of deferred Dependabot-originated updates have been accepted. They all relate to (limited) automated testing and Docker image creation. + Version 4.3.7-dev-11-g7367d042 == **Automated Docker Build Fixes**