diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b49df63..9d2f4c7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -283,7 +283,7 @@ jobs: ref: ${{ inputs.ref || github.sha }} - name: Set up Buildx - uses: docker/setup-buildx-action@v3 + uses: docker/setup-buildx-action@v4 with: buildkitd-flags: --debug diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 78dea4f..258be83 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -55,20 +55,20 @@ jobs: echo "version=$VERSION" >> $GITHUB_OUTPUT - name: Set up QEMU - uses: docker/setup-qemu-action@v3 + uses: docker/setup-qemu-action@v4 - name: Set up Buildx - uses: docker/setup-buildx-action@v3 + uses: docker/setup-buildx-action@v4 - name: Login to DockerHub - uses: docker/login-action@v3 + uses: docker/login-action@v4 with: username: zensical password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Generate tags and labels id: meta - uses: docker/metadata-action@v5 + uses: docker/metadata-action@v6 env: VERSION: ${{ steps.version.outputs.version }} with: @@ -91,7 +91,7 @@ jobs: run: python scripts/prepare.py - name: Build image - uses: docker/build-push-action@v6 + uses: docker/build-push-action@v7 with: context: . load: true @@ -109,7 +109,7 @@ jobs: docker run --rm -i -v $PWD:/docs $IMAGE:$VERSION build - name: Build and push image - uses: docker/build-push-action@v6 + uses: docker/build-push-action@v7 with: context: . platforms: | diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 951219b..06f1d66 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -132,7 +132,7 @@ jobs: fetch-tags: true - name: Download artifacts - uses: actions/download-artifact@v4 + uses: actions/download-artifact@v8 with: path: artifacts merge-multiple: true diff --git a/crates/zensical-watch/src/agent/monitor.rs b/crates/zensical-watch/src/agent/monitor.rs index 189173d..0d3837b 100644 --- a/crates/zensical-watch/src/agent/monitor.rs +++ b/crates/zensical-watch/src/agent/monitor.rs @@ -398,10 +398,7 @@ impl Monitor { // added a path that covers an actively watched path let mut watched: Option<&PathBuf> = None; for (current, active) in &mut self.paths { - if watched - .filter(|prefix| current.starts_with(prefix)) - .is_some() - { + if watched.is_some_and(|prefix| current.starts_with(prefix)) { // The actively watched path is a prefix of the current path, // so a covering path was added, which means we must remove it if *active == true {