Merge branch 'main' of github.com:ArchitectSMP/mc-config

Author: ChipWolf

.github/workflows/generate.yaml

@@ -10,7 +10,8 @@ jobs:
   paper:
     runs-on: ubuntu-latest
     env:
-      working-directory: ${{ github.workspace }}/base/paper/
+      base-directory: ${{ github.workspace }}/base/paper
+      run-directory: ${{ github.workspace }}/base/paper/run
     steps:
       - uses: actions/checkout@v2
         with:
@@ -20,16 +21,15 @@ jobs:
         run: |
           sudo wget -L https://github.com/mikefarah/yq/releases/latest/download/yq_linux_amd64 -O /usr/local/bin/yq
           sudo chmod +x /usr/local/bin/yq
-          rm -rf * && mkdir run
-        working-directory: ${{ env.working-directory }}
+          rm -rf ${{ env.base-directory }} && mkdir -p ${{ env.run-directory }}
       - uses: addnab/docker-run-action@v2
         continue-on-error: true
         timeout-minutes: 3
         with:
           image: itzg/minecraft-server:latest
           shell: bash
           options: |
-            -v ${{ env.working-directory }}/run:/data
+            -v ${{ env.run-directory }}:/data
             -v ${{ github.workspace }}/plugins/paper:/plugins
             -e UID=1001 -e GID=116 -e EULA=TRUE
             -e MAX_TICK_TIME=1 -e MAX_WORLD_SIZE=1
@@ -42,14 +42,14 @@ jobs:
         run: |
           find . -type f -exec sed -i -e '/^[ \t]*#/d; /^[[:space:]]*$/d; s/[[:blank:]]*$//' {} +
           find . -type f -name "*.jar" -o -empty -delete
-        working-directory: ${{ env.working-directory }}
+        working-directory: ${{ env.base-directory }}
       - name: Merge
         run: |
-          for f in $(find * -type f); do
-            mkdir -p $(dirname ${{ env.working-directory }}/${f}) && touch ${{ env.working-directory }}/${f}
-            yq eval-all -iMPI2 'select(fileIndex == 0) * select(fileIndex == 1)' ${{ env.working-directory }}/${f} ${f}
-          done
-        working-directory: ${{ env.working-directory }}/run
+          for f in $(find * -type f -name "*.yml" -o -name "*.yaml" -o -name "*.txt"); do
+            echo $f && mkdir -p $(dirname "${{ env.base-directory }}/${f}")
+            yq e -MPI2 "${f}" > "${{ env.base-directory }}/${f}"
+          done && cp -rn * ${{ env.base-directory }} && rm -rf *
+        working-directory: ${{ env.run-directory }}
       - name: Create pull request
         uses: peter-evans/create-pull-request@v3
         with:

.github/workflows/patch.yaml

@@ -29,15 +29,11 @@ jobs:
             yq eval-all -iMPI2 'select(fileIndex == 0) * select(fileIndex == 1)' ${{ env.base-directory }}/${f} ${f}
           done
         working-directory: ${{ env.overlay-directory }}
-      - name: Create pull request
-        uses: peter-evans/create-pull-request@v3
+      - name: Archive Release
+        run: |
+          zip -r paper.zip . && mv paper.zip ${{ github.workspace }}
+        working-directory: ${{ env.base-directory }}
+      - uses: ncipollo/release-action@v1
         with:
+          artifacts: "paper.zip"
           token: ${{ secrets.GITHUB_TOKEN }}
-          branch: minecraft-configs
-          title: "chore(final): merge paper patches with base [ci-skip]"
-          signoff: true
-          committer: "${{ github.actor }} <${{ github.actor }}@users.noreply.github.com>"
-          author: "${{ github.actor }} <${{ github.actor }}@users.noreply.github.com>"
-          labels: minecraft/configs
-          body: |
-            Signed-off-by: Chip Wolf <[email protected]>