Merge branch 'main' into main

.dockerignore

@@ -16,6 +16,11 @@ app/pkg/*
 Dockerfile
 .dockerignore
 
+# Don't track docs
+README.md
+LICENSE
+docs/*
+
 # Various config files that shouldn't be tracked
 lldap_config.toml
 server_key

.github/dependabot.yml

@@ -0,0 +1,10 @@
+# Set update schedule for GitHub Actions
+
+version: 2
+updates:
+
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      # Check for updates to GitHub Actions every weekday
+      interval: "daily"

.github/workflows/docker.yml

@@ -1,11 +1,12 @@
-name: ci
+name: docker
 
 on:
   push:
     branches:
       - 'main'
-    tags:
-      - 'v*.*.*'
+  release:
+    types:
+      - 'published'
   pull_request:
     branches:
       - 'main'
@@ -43,8 +44,14 @@ jobs:
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+        # Parse the tag into semver.
+      - uses: gacts/github-slug@v1
+        id: slug
+
       -
         name: Build and push
+        if: github.event_name != 'release'
         uses: docker/build-push-action@v2
         with:
           context: .
@@ -53,6 +60,20 @@ jobs:
           tags: nitnelave/lldap:latest
           cache-from: type=gha
           cache-to: type=gha,mode=max
+
+      -
+        name: Build and push
+        if: github.event_name == 'release'
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          push: true
+          platforms: linux/amd64
+          # Tag as latest, stable, semver, major, major.minor and major.minor.patch.
+          tags: nitnelave/lldap:latest, nitnelave/lldap:stable, nitnelave/lldap:v${{ steps.slug.outputs.version-semantic }}, nitnelave/lldap:v${{ steps.slug.outputs.version-major }}, nitnelave/lldap:v${{ steps.slug.outputs.version-major }}.${{ steps.slug.outputs.version-minor }}, nitnelave/lldap:v${{ steps.slug.outputs.version-major }}.${{ steps.slug.outputs.version-minor }}.${{ steps.slug.outputs.version-patch }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+
       -
         name: Update repo description
         if: github.event_name != 'pull_request'

.github/workflows/rust.yml

@@ -10,8 +10,25 @@ env:
   CARGO_TERM_COLOR: always
 
 jobs:
+  pre_job:
+    # continue-on-error: true # Uncomment once integration is finished
+    runs-on: ubuntu-latest
+    # Map a step output to a job output
+    outputs:
+      should_skip: ${{ steps.skip_check.outputs.should_skip }}
+    steps:
+      - id: skip_check
+        uses: fkirc/skip-duplicate-actions@master
+        with:
+          # All of these options are optional, so you can remove them if you are happy with the defaults
+          concurrent_skipping: 'never'
+          skip_after_successful_duplicate: 'true'
+          paths_ignore: '["**/README.md", "**/docs/**"]'
+          do_not_skip: '["pull_request", "workflow_dispatch", "schedule"]'
   test:
     name: cargo test
+    needs: pre_job
+    if: ${{ needs.pre_job.outputs.should_skip != 'true' }}
     runs-on: ubuntu-latest
 
     steps:
@@ -30,6 +47,8 @@ jobs:
 
   clippy:
     name: cargo clippy
+    needs: pre_job
+    if: ${{ needs.pre_job.outputs.should_skip != 'true' }}
     runs-on: ubuntu-latest
     steps:
       - name: Checkout sources
@@ -53,6 +72,8 @@ jobs:
 
   format:
     name: cargo fmt
+    needs: pre_job
+    if: ${{ needs.pre_job.outputs.should_skip != 'true' }}
     runs-on: ubuntu-latest
     steps:
       - name: Checkout sources
@@ -76,6 +97,8 @@ jobs:
 
   coverage:
     name: Code coverage
+    needs: pre_job
+    if: ${{ needs.pre_job.outputs.should_skip != 'true' }}
     runs-on: ubuntu-latest
     steps:
       - name: Checkout sources
@@ -96,7 +119,7 @@ jobs:
       - name: Aggregate reports
         run: cargo llvm-cov --no-run --lcov --output-path lcov.info
       - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v1
+        uses: codecov/codecov-action@v2.1.0
         with:
           files: lcov.info
           fail_ci_if_error: true

README.md

@@ -82,7 +82,7 @@ volumes:
 
 services:
   lldap:
-    image: nitnelave/lldap
+    image: nitnelave/lldap:stable
     # Change this to the user:group you want.
     user: "33:33"
     ports:

app/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "lldap_app"
-version = "0.2.0"
-authors = ["Valentin Tolmer <valentin@tolmer.fr>", "Steve Barrau <steve.barrau@gmail.com>", "Thomas Wickham <mackwic@gmail.com>"]
+version = "0.3.0-alpha.1"
+authors = ["Valentin Tolmer <valentin@tolmer.fr>"]
 edition = "2021"
 
 [dependencies]

auth/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "lldap_auth"
-version = "0.2.0"
-authors = ["Valentin Tolmer <valentin@tolmer.fr>", "Steve Barrau <steve.barrau@gmail.com>", "Thomas Wickham <mackwic@gmail.com>"]
+version = "0.3.0-alpha.1"
+authors = ["Valentin Tolmer <valentin@tolmer.fr>"]
 edition = "2021"
 
 [features]

server/Cargo.toml

@@ -1,8 +1,8 @@
 [package]
-authors = ["Valentin Tolmer <valentin@tolmer.fr>", "Steve Barrau <steve.barrau@gmail.com>", "Thomas Wickham <mackwic@gmail.com>"]
+authors = ["Valentin Tolmer <valentin@tolmer.fr>"]
 edition = "2021"
 name = "lldap"
-version = "0.2.0"
+version = "0.3.0-alpha.1"
 
 [dependencies]
 actix = "0.12"