diff --git a/.github/workflows/debian_package_kanidm.yml b/.github/workflows/debian_package_kanidm.yml index cc427a3a3..30f7e488e 100644 --- a/.github/workflows/debian_package_kanidm.yml +++ b/.github/workflows/debian_package_kanidm.yml @@ -21,7 +21,7 @@ jobs: - debian:11 - debian:10 runs-on: ubuntu-latest - container: + container: image: ${{ matrix.image }} env: DEBIAN_FRONTEND: noninteractive @@ -61,6 +61,7 @@ jobs: name: Upload to releases needs: build-deb-package runs-on: ubuntu-latest + if: ${{ github.ref == 'refs/heads/master' }} steps: - name: Download previously built debs uses: actions/download-artifact@v3 @@ -76,4 +77,3 @@ jobs: prerelease: true title: "Ubuntu Packages" files: "*.deb" - if: ${{ github.ref == 'refs/heads/master' }} diff --git a/.github/workflows/dependabot_auto_merge.yml b/.github/workflows/dependabot_auto_merge.yml index 40b81a4af..2c265a753 100644 --- a/.github/workflows/dependabot_auto_merge.yml +++ b/.github/workflows/dependabot_auto_merge.yml @@ -31,7 +31,6 @@ jobs: PR_URL: ${{github.event.pull_request.html_url}} GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}} - name: Enable auto-merge for Dependabot PRs - if: ${{contains(steps.metadata.outputs.dependency-names, 'my-dependency') && steps.metadata.outputs.update-type == 'version-update:semver-patch'}} run: gh pr merge --auto --merge "$PR_URL" env: PR_URL: ${{github.event.pull_request.html_url}} diff --git a/Cargo.lock b/Cargo.lock index 33bdb515c..417a1acee 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2557,9 +2557,9 @@ dependencies = [ [[package]] name = "ldap3_client" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9599af178521f7eb322e27c8e9998bcb864a374613b50e2cf941474102296b4f" +checksum = "0236f3aac28f4f79929664cd635f310fa7469f17b67d45c85848a0f3ca516d53" dependencies = [ "base64 0.13.1", "base64urlsafedata", diff --git a/Cargo.toml b/Cargo.toml index 7f1f9048f..017c3f538 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -83,7 +83,7 @@ kanidm_unix_int = { path = "./unix_integration" } last-git-commit = "0.2.0" # REMOVE this lazy_static = "^1.4.0" -ldap3_client = "^0.3.1" +ldap3_client = "^0.3.2" ldap3_proto = "^0.3.2" # ldap3_client = { path = "../ldap3/client", version = "0.3.0" }