Merge branch 'Aardwolf-Social:main' into main

Aardwolf-Social · Oct 16, 2024 · 3a43e18 · 3a43e18
2 parents c30f13c + 3301489
commit 3a43e18
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 8 deletions.
diff --git a/.github/workflows/aardwolf-build.yml b/.github/workflows/aardwolf-build.yml
@@ -1,9 +1,6 @@
 ---
 name: CI Build
 on:
-  push:
-    branches:
-      - "*"
   pull_request:
     branches:
       - main

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -7,8 +7,8 @@ name: 'Docker Image CI'
 on:
   pull_request:
     branches:
-     - 'main'
-     - 'banjofox/*'
+      - main
+      - 'banjofox/*'
 
 jobs:
 

diff --git a/.github/workflows/rust-clippy.yml b/.github/workflows/rust-clippy.yml
@@ -14,6 +14,7 @@ on:
     branches:
      - main
      - 'banjofox/*'
+
   schedule:
     - cron: '41 3 * * 4'
 

diff --git a/Cargo.toml b/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "aardwolf"
 version = "0.1.0"
-authors = ["Banjo Fox <[email protected]>","Elijah Mark Anderson <[email protected]>", "Paul Woolcock <[email protected]>", "asonix <[email protected]>"]
+authors = ["Banjo Fox <[email protected]>","Elijah Mark Anderson <[email protected]>", "Paul Woolcock <[email protected]>", "asonix <[email protected]>", "Nicholas Guyett <[email protected]>"]
 description = "Powering connected social communities with free software."
 edition = "2021"
 

diff --git a/aardwolf-localization/src/lib.rs b/aardwolf-localization/src/lib.rs
@@ -38,4 +38,3 @@ i18n!("locales",
 i18n!();
 
 // End rust-i18n configuration
-//
diff --git a/aardwolf-templates/Cargo.toml b/aardwolf-templates/Cargo.toml
@@ -37,4 +37,4 @@ path = "../aardwolf-yew-frontend"
 # Adding syn for template compilation
 [dependencies.syn]
 version = "2.0.77"
-features = ["full", "extra-traits"]
+features = ["full", "extra-traits"]
Original file line number	Diff line number	Diff line change
Expand Up		@@ -38,4 +38,3 @@ i18n!("locales",
		i18n!();

		// End rust-i18n configuration
		//