Skip to content

Commit

Permalink
chore: merge main into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
nosduco committed Nov 2, 2023
2 parents 5cf06b2 + 6f58a4e commit 2bf5a91
Show file tree
Hide file tree
Showing 6 changed files with 35 additions and 35 deletions.
5 changes: 4 additions & 1 deletion .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,7 @@ updates:
directory: "/"
schedule:
interval: "daily"
target-branch: "dev"
commit-message:
prefix: fix
prefix-development: chore
include: scope
27 changes: 0 additions & 27 deletions .github/workflows/dev.yml

This file was deleted.

9 changes: 5 additions & 4 deletions .github/workflows/ci.yml → .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
on: [push, pull_request]
on:
push:
branches:
- main
pull_request:

name: CI

Expand All @@ -16,7 +20,6 @@ jobs:
- uses: actions-rs/cargo@v1
with:
command: check

fmt:
name: Format
runs-on: ubuntu-22.04
Expand All @@ -32,7 +35,6 @@ jobs:
with:
command: fmt
args: --all -- --check

clippy:
name: Clippy
runs-on: ubuntu-22.04
Expand All @@ -48,7 +50,6 @@ jobs:
with:
command: clippy
args: -- -D warnings

build:
name: Build
runs-on: ubuntu-22.04
Expand Down
23 changes: 23 additions & 0 deletions .github/workflows/release-prepare.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
on:
push:
branches:
- main

permissions:
contents: write
pull-requests: write

name: Release

jobs:
prepare:
name: Prepare
runs-on: ubuntu-latest
steps:
- name: Prepare release
uses: google-github-actions/release-please-action@v3
with:
release-type: rust
package-name: nforwardauth
pull-request-header: Prepared release-type
changelog-types: '[{"type":"feat","section":"Features"},{"type":"fix","section":"Bug Fixes"},{"type":"doc","section":"Documentation"},{"type":"perf","section":"Performance"},{"type":"refactor","section":"Refactor"},{"type":"test","section":"Testing"},{"type":"chore","section":"Miscellaneous Tasks"},{"type":"ci","section":"CI/CD"}]'
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ on:
name: Release

jobs:
build-and-release:
name: Build and Release
build-and-publish:
name: Build and Publish
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "nforwardauth"
version = "1.2.0"
version = "1.2.2"
edition = "2021"

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
Expand Down

0 comments on commit 2bf5a91

Please sign in to comment.