diff --git a/.github/workflows/build-docker.yml b/.github/workflows/build-docker.yml index c17f985182..f25226c1b7 100644 --- a/.github/workflows/build-docker.yml +++ b/.github/workflows/build-docker.yml @@ -55,6 +55,9 @@ jobs: - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 + - name: Sanitize branch name + run: echo "SAFE_REF=${GITHUB_REF_NAME//\//-}" >> $GITHUB_ENV + - name: Build container uses: docker/build-push-action@v6 with: @@ -65,8 +68,8 @@ jobs: tags: "${{ env.GHCR_REPO }}:${{ github.sha }}-${{ matrix.tag }}" cache-from: | type=registry,ref=${{ env.GHCR_REPO }}:cache-${{ matrix.tag }} - type=registry,ref=${{ env.GHCR_REPO }}:cache-${{ matrix.tag }}-${{ github.ref_name }} - cache-to: type=registry,mode=max,ref=${{ env.GHCR_REPO }}:cache-${{ matrix.tag }}-${{ github.ref_name }} + type=registry,ref=${{ env.GHCR_REPO }}:cache-${{ matrix.tag }}-${{ env.SAFE_REF }} + cache-to: type=registry,mode=max,ref=${{ env.GHCR_REPO }}:cache-${{ matrix.tag }}-${{ env.SAFE_REF }} - name: Scan image with Trivy uses: aquasecurity/trivy-action@0.32.0 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 45da7f893d..7129fd2b56 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -97,7 +97,7 @@ jobs: - name: Install Rust stable uses: actions-rs/toolchain@v1 with: - toolchain: stable + toolchain: 1.89.0 target: ${{ matrix.target }} override: true diff --git a/Cargo.lock b/Cargo.lock index 2f4b4890ec..0bd268902d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1115,7 +1115,7 @@ dependencies = [ [[package]] name = "defguard_common" -version = "1.5.0" +version = "1.5.1" dependencies = [ "anyhow", "base64 0.22.1", diff --git a/crates/defguard_common/Cargo.toml b/crates/defguard_common/Cargo.toml index e035598ecf..3ab2e155a1 100644 --- a/crates/defguard_common/Cargo.toml +++ b/crates/defguard_common/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "defguard_common" -version = "1.5.0" +version = "1.5.1" edition.workspace = true license-file.workspace = true homepage.workspace = true diff --git a/crates/defguard_core/src/handlers/settings.rs b/crates/defguard_core/src/handlers/settings.rs index 4e72b70e38..6d4b3df06e 100644 --- a/crates/defguard_core/src/handlers/settings.rs +++ b/crates/defguard_core/src/handlers/settings.rs @@ -128,10 +128,7 @@ pub async fn patch_settings( context: ApiRequestContext, Json(data): Json, ) -> ApiResult { - debug!( - "Admin {} patching settings with {data:?}", - session.user.username - ); + debug!("Admin {} patching settings", session.user.username); let mut settings = Settings::get_current_settings(); // prepare clone for emitting an event let before = settings.clone();