Merge branch 'master' into n-to-n-wirestest

.github/CONTRIBUTING.md

@@ -828,3 +828,5 @@ This repository uses `LF` line endings for all code as specified in the **.gitat
 Unless overridden or a non standard git binary is used the line ending settings should be applied to your clone automatically.
 
 Note: VSC requires an [extension](https://marketplace.visualstudio.com/items?itemName=EditorConfig.EditorConfig) to take advantage of editorconfig.
+
+Github actions that require additional configuration are disabled on the repository until ACTION_ENABLER secret is created with non-empty value.

.github/workflows/compile_changelogs.yml

@@ -9,44 +9,44 @@ jobs:
     name: "Compile changelogs"
     runs-on: ubuntu-20.04
     steps:
-      - name: "Check for CHANGELOG_ENABLER secret and pass true to output if it exists to be checked by later steps"
+      - name: "Check for ACTION_ENABLER secret and pass true to output if it exists to be checked by later steps"
         id: value_holder
         env:
-          CHANGELOG_ENABLER: ${{ secrets.CHANGELOG_ENABLER }}
+          ENABLER_SECRET: ${{ secrets.ACTION_ENABLER }}
         run: |
           unset SECRET_EXISTS
-          if [ -n $CHANGELOG_ENABLER ]; then SECRET_EXISTS='true' ; fi
-          echo ::set-output name=CL_ENABLED::${SECRET_EXISTS}
+          if [ -n $ENABLER_SECRET ]; then SECRET_EXISTS='true' ; fi
+          echo ::set-output name=ACTIONS_ENABLED::${SECRET_EXISTS}
       - name: "Setup python"
-        if: steps.value_holder.outputs.CL_ENABLED
+        if: steps.value_holder.outputs.ACTIONS_ENABLED
         uses: actions/setup-python@v1
         with:
           python-version: '3.x'
       - name: "Install deps"
-        if: steps.value_holder.outputs.CL_ENABLED
+        if: steps.value_holder.outputs.ACTIONS_ENABLED
         run: |
           python -m pip install --upgrade pip
           python -m pip install pyyaml
           sudo apt-get install  dos2unix
       - name: "Checkout"
-        if: steps.value_holder.outputs.CL_ENABLED
+        if: steps.value_holder.outputs.ACTIONS_ENABLED
         uses: actions/checkout@v1
         with:
           fetch-depth: 25
       - name: "Compile"
-        if: steps.value_holder.outputs.CL_ENABLED
+        if: steps.value_holder.outputs.ACTIONS_ENABLED
         run: |
           python tools/ss13_genchangelog.py html/changelogs
       - name: Commit
-        if: steps.value_holder.outputs.CL_ENABLED
+        if: steps.value_holder.outputs.ACTIONS_ENABLED
         run: |
           git config --local user.email "action@github.com"
           git config --local user.name "Changelogs"
           git pull origin master
           git add html/changelogs
           git commit -m "Automatic changelog compile [ci skip]" -a || true
       - name: "Push"
-        if: steps.value_holder.outputs.CL_ENABLED
+        if: steps.value_holder.outputs.ACTIONS_ENABLED
         uses: ad-m/github-push-action@master
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/gbp.yml

@@ -6,22 +6,35 @@ jobs:
   gbp:
     runs-on: ubuntu-latest
     steps:
+    - name: "Check for ACTION_ENABLER secret and pass true to output if it exists to be checked by later steps"
+      id: value_holder
+      env:
+        ENABLER_SECRET: ${{ secrets.ACTION_ENABLER }}
+      run: |
+        unset SECRET_EXISTS
+        if [ -n $ENABLER_SECRET ]; then SECRET_EXISTS='true' ; fi
+        echo ::set-output name=ACTIONS_ENABLED::${SECRET_EXISTS}
     - name: Checkout
+      if: steps.value_holder.outputs.ACTIONS_ENABLED
       uses: actions/checkout@v2
     - name: Setup git
+      if: steps.value_holder.outputs.ACTIONS_ENABLED
       run: |
         git config --global user.name "gbp-action"
         git config --global user.email "<>"
     - name: Checkout alternate branch
+      if: steps.value_holder.outputs.ACTIONS_ENABLED
       uses: actions/checkout@v2
       with:
         ref: "gbp-balances" # The branch name
         path: gbp-balances
     # This is to ensure we keep the gbp.toml from master
     # without having to update our separate branch.
     - name: Copy configuration
+      if: steps.value_holder.outputs.ACTIONS_ENABLED
       run: cp ./.github/gbp.toml ./gbp-balances/.github/gbp.toml
     - name: GBP action
+      if: steps.value_holder.outputs.ACTIONS_ENABLED
       uses: tgstation/gbp-action@master
       with:
         branch: "gbp-balances"

.github/workflows/gbp_collect.yml

@@ -8,22 +8,35 @@ jobs:
   gbp_collection:
     runs-on: ubuntu-latest
     steps:
+    - name: "Check for ACTION_ENABLER secret and pass true to output if it exists to be checked by later steps"
+      id: value_holder
+      env:
+        ENABLER_SECRET: ${{ secrets.ACTION_ENABLER }}
+      run: |
+        unset SECRET_EXISTS
+        if [ -n $ENABLER_SECRET ]; then SECRET_EXISTS='true' ; fi
+        echo ::set-output name=ACTIONS_ENABLED::${SECRET_EXISTS}
     - name: Checkout
+      if: steps.value_holder.outputs.ACTIONS_ENABLED
       uses: actions/checkout@v2
     - name: Setup git
+      if: steps.value_holder.outputs.ACTIONS_ENABLED
       run: |
         git config --global user.name "github-actions[bot]"
         git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com"
     - name: Checkout alternate branch
+      if: steps.value_holder.outputs.ACTIONS_ENABLED
       uses: actions/checkout@v2
       with:
         ref: "gbp-balances" # The branch name
         path: gbp-balances
     # This is to ensure we keep the gbp.toml from master
     # without having to update our separate branch.
     - name: Copy configuration
+      if: steps.value_holder.outputs.ACTIONS_ENABLED
       run: cp ./.github/gbp.toml ./gbp-balances/.github/gbp.toml
     - name: GBP action
+      if: steps.value_holder.outputs.ACTIONS_ENABLED
       uses: Mothblocks/gbp-action@collate-changes
       with:
         collect: "true"