From 4b1d8777420d03c8f4be6b2d3ffc370b025a7351 Mon Sep 17 00:00:00 2001
From: Stacky McStackface <95074132+stackable-bot@users.noreply.github.com>
Date: Thu, 16 Dec 2021 17:05:21 +0100
Subject: [PATCH] Update templated files to rev 3451442 (#60)

* Generated commit to update templated files based on rev 3451442 in stackabletech/operator-templating repo.

Original commit message:
Revert -Added an environment variable to disable lookups in log4j strings. (#32)- (#34)

This reverts commit 1c43a92fd5846264c113fe7955b805740482a288.

* Github Actions: Generated k8s manifest files

Co-authored-by: Stacky McStackface <stackable-bot@users.noreply.github.com>
---
 .github/workflows/pr_generate_manifests.yml |  6 ++++++
 .github/workflows/rust.yml                  |  6 +++---
 bors.toml                                   | 10 ++++++++++
 3 files changed, 19 insertions(+), 3 deletions(-)
 create mode 100644 bors.toml

diff --git a/.github/workflows/pr_generate_manifests.yml b/.github/workflows/pr_generate_manifests.yml
index 8ea9b183..c480eedf 100644
--- a/.github/workflows/pr_generate_manifests.yml
+++ b/.github/workflows/pr_generate_manifests.yml
@@ -20,8 +20,14 @@ jobs:
         with:
           version: v3.6.2
       - name: update manifests
+        env:
+          NEXUS_PASSWORD: ${{ secrets.NEXUS_PASSWORD }}
+        if: env.NEXUS_PASSWORD != null
         run: make generate-manifests
       - name: Add & Commit
+        env:
+          NEXUS_PASSWORD: ${{ secrets.NEXUS_PASSWORD }}
+        if: env.NEXUS_PASSWORD != null
         uses: EndBug/add-and-commit@v7
         with:
           default_author: user_info
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 52f25e95..d4bec303 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -8,6 +8,8 @@ on:
   push:
     branches:
       - main
+      - staging
+      - trying
   pull_request:
 
 env:
@@ -32,9 +34,6 @@ jobs:
       - uses: actions-rs/cargo@v1.0.3
         with:
           command: test
-      - uses: actions-rs/cargo@v1.0.3
-        with:
-          command: clean
 
   rustfmt:
     name: Run rustfmt
@@ -80,6 +79,7 @@ jobs:
             toolchain: stable
             components: clippy
             override: true
+      - uses: Swatinem/rust-cache@v1.3.0
       # We need this due to: https://github.com/actions-rs/clippy-check/issues/2
       - name: Check workflow permissions
         id: check_permissions
diff --git a/bors.toml b/bors.toml
new file mode 100644
index 00000000..2ce6da66
--- /dev/null
+++ b/bors.toml
@@ -0,0 +1,10 @@
+status = [
+    'Run tests',
+    'Run rustfmt',
+    'Run rustdoc',
+    'Run clippy',
+    'Run cargo deny (bans licenses sources)'
+]
+delete_merged_branches = true
+pr_status = [ 'license/cla' ]
+timeout_sec = 7200
\ No newline at end of file