Add Action to auto-label PRs with merge conflicts (#682 )

Bump DiscordRPC plugin to v10 (#666 )
Bump softprops/action-gh-release action to v2 (#652 )
2025-09-18 19:30:50 +02:00 · 2024-08-09 13:22:51 +02:00 · 2024-07-06 02:30:35 +02:00 · 2024-06-22 12:09:23 +02:00 · 2024-06-18 15:04:50 +02:00 · 2024-03-03 12:22:12 +01:00
3 changed files with 54 additions and 33 deletions
--- a/.github/workflows/merge-conflict-auto-label.yml
+++ b/.github/workflows/merge-conflict-auto-label.yml
@@ -0,0 +1,19 @@
+name: Merge Conflict Auto Label
+on:
+  workflow_dispatch: # Manual run
+  push:
+    branches:
+      - main
+  schedule:
+    - cron: "10 21 * * *" # Runs at 21:10; time was chosen based on contributor activity and low GitHub Actions cron load.
+
+jobs:
+  triage:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: mschilde/auto-label-merge-conflicts@master
+        with:
+          CONFLICT_LABEL_NAME: "merge conflicts"
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          MAX_RETRIES: 5
+          WAIT_MS: 5000
--- a/.github/workflows/post-to-mastodon.yml
+++ b/.github/workflows/post-to-mastodon.yml
@@ -9,9 +9,8 @@ jobs:
    steps:
      - name: Send toot to Mastodon
        id: mastodon
-        uses: cbrgm/mastodon-github-action@v1
+        uses: cbrgm/mastodon-github-action@v2
        with:
          message: "We just released Northstar ${{ github.event.release.tag_name }}\n\n${{ github.event.release.html_url }}"
-        env:
-          MASTODON_URL: ${{ secrets.MASTODON_URL }}
-          MASTODON_ACCESS_TOKEN: ${{ secrets.MASTODON_ACCESS_TOKEN }}
+          url: ${{ secrets.MASTODON_URL }}
+          access-token: ${{ secrets.MASTODON_ACCESS_TOKEN }}
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -1,4 +1,4 @@
-name: Build
+name: Release
 on:
  push:
    tags:
@@ -18,10 +18,10 @@ env:

 jobs:
  build-northstar:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
    steps:
      - name: Checkout release files
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
        with:
          ref: ${{ env.NORTHSTAR_VERSION }}
          path: northstar
@@ -34,12 +34,12 @@ jobs:
          wget "https://github.com/R2Northstar/NorthstarLauncher/releases/download/${{ env.NORTHSTAR_VERSION }}/northstar-launcher.zip"
      - name: Download DiscordRPC plugin
        run:
-          wget "https://github.com/R2Northstar/NorthstarDiscordRPC/releases/download/v5/northstar-discord-rpc.zip"
+          wget "https://github.com/R2Northstar/NorthstarDiscordRPC/releases/download/v10/northstar-discord-rpc.zip"
      - name: Download compiled stubs
        run:
          wget "https://github.com/R2Northstar/NorthstarStubs/releases/download/v1/NorthstarStubs.zip"
      - name: Checkout core mods
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
        with:
          repository: R2Northstar/NorthstarMods
          ref: ${{ env.NORTHSTAR_VERSION }}
@@ -57,11 +57,11 @@ jobs:
          git ls-tree -r $NORTHSTAR_VERSION --name-only | xargs -L1 md5sum >> md5sum.txt
      - name: Make folder structure
        run: |
-          mv -v northstar/release/* northstar/.
-          rm -d northstar/release
-          mkdir -p northstar/R2Northstar/mods
-          mkdir -p northstar/R2Northstar/plugins
-          mkdir -p northstar/bin/x64_dedi
+          mv --verbose northstar/release/* northstar/.
+          rm --dir northstar/release
+          mkdir --parents northstar/R2Northstar/mods
+          mkdir --parents northstar/R2Northstar/plugins
+          mkdir --parents northstar/bin/x64_dedi

          unzip northstar-discord-rpc.zip -d northstar/R2Northstar/plugins

@@ -69,22 +69,22 @@ jobs:
          unzip northstar-launcher.zip -d northstar
          rsync -avr --exclude="Northstar.Coop" --exclude=".git*" northstar-mods/. northstar/R2Northstar/mods
      - name: Checkout Navmesh repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
        with:
          repository: R2Northstar/NorthstarNavs
-          ref: 'v2'
+          ref: 'v3'
          path: northstar-navs
      - name: Navmeshes setup
        run: |
-          mkdir -p northstar/R2Northstar/mods/Northstar.CustomServers/mod/maps
-          mv -v northstar-navs/graphs northstar/R2Northstar/mods/Northstar.CustomServers/mod/maps
-          mv -v northstar-navs/navmesh northstar/R2Northstar/mods/Northstar.CustomServers/mod/maps
+          mkdir --parents northstar/R2Northstar/mods/Northstar.CustomServers/mod/maps
+          mv --verbose northstar-navs/graphs northstar/R2Northstar/mods/Northstar.CustomServers/mod/maps
+          mv --verbose northstar-navs/navmesh northstar/R2Northstar/mods/Northstar.CustomServers/mod/maps
      - name: Cleanup root Northstar repository files
        working-directory: northstar
        run: |
          rm -rf .git .github .gitignore *.md LICENSE thunderstore .ci.env.example *.sh
      - name: Upload
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
        with:
          name: Northstar.release.${{ env.NORTHSTAR_VERSION }}
          path: northstar
@@ -96,8 +96,11 @@ jobs:
      - name: Compute SHA-512 checksum
        run: |
          sha512sum Northstar.release.${{ env.NORTHSTAR_VERSION }}.zip
+          echo "\`\`\`" >> $GITHUB_STEP_SUMMARY
+          sha512sum Northstar.release.${{ env.NORTHSTAR_VERSION }}.zip >> $GITHUB_STEP_SUMMARY
+          echo "\`\`\`" >> $GITHUB_STEP_SUMMARY
      - name: Upload zip to release draft
-        uses: softprops/action-gh-release@v1
+        uses: softprops/action-gh-release@v2
        if: startsWith(github.ref, 'refs/tags/v') && !contains(env.NORTHSTAR_VERSION, '-rc')
        with:
          draft: true
@@ -118,33 +121,33 @@ jobs:
      TS_NAMESPACE: northstar
      TS_MOD_NAME: Northstar
      TS_MOD_DESCRIPTION: Titanfall 2 modding and custom server framework.
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
    steps:
      - name: Setup tcli
        run: |
-          wget -O tcli.tar.gz https://github.com/thunderstore-io/thunderstore-cli/releases/download/0.1.4/tcli-0.1.4-linux-x64.tar.gz
+          wget --output-document tcli.tar.gz https://github.com/thunderstore-io/thunderstore-cli/releases/download/0.1.4/tcli-0.1.4-linux-x64.tar.gz
          tar xvf tcli.tar.gz
-          sudo mv -v tcli-0.1.4-linux-x64/tcli /bin
+          sudo mv --verbose tcli-0.1.4-linux-x64/tcli /bin

      - name: (DEBUG) Download Northstar package
        if: ${{ env.ACT }} # Download Northstar package from releases when running locally instead of relying on previous jobs
        run: |
-          wget -O northstar.zip https://github.com/R2Northstar/Northstar/releases/download/v1.6.3/Northstar.release.v1.6.3.zip
+          wget --output-document northstar.zip https://github.com/R2Northstar/Northstar/releases/download/v1.6.3/Northstar.release.v1.6.3.zip
          unzip northstar.zip -d northstar

      - name: Download Northstar package
        if: ${{ !env.ACT }} # Download artifacts from previous jobs when running on GitHub's infrastructure
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
        with:
          name: Northstar.release.${{ env.NORTHSTAR_VERSION }}
          path: northstar

      - name: Make package structure
        run: |
-          mkdir -p thunderstore/dist/Northstar
-          mv -v northstar/* thunderstore/dist/Northstar
-          wget -O thunderstore/icon.png https://raw.githubusercontent.com/R2Northstar/Northstar/main/thunderstore/icon.png
-          wget -O thunderstore/README.md https://raw.githubusercontent.com/R2Northstar/Northstar/main/thunderstore/README.md
+          mkdir --parents thunderstore/dist/Northstar
+          mv --verbose northstar/* thunderstore/dist/Northstar
+          wget --output-document thunderstore/icon.png https://raw.githubusercontent.com/R2Northstar/Northstar/main/thunderstore/icon.png
+          wget --output-document thunderstore/README.md https://raw.githubusercontent.com/R2Northstar/Northstar/main/thunderstore/README.md

      - name: Setup environment variables
        run: |
@@ -167,9 +170,9 @@ jobs:
        run: |
          tcli init --package-name=$TS_MOD_NAME --package-namespace=$TS_NAMESPACE --package-version $MOD_VERSION

-          sed -i "s/communities = \[\]/communities = [\"$TS_COMMUNITY\"]/g" thunderstore.toml
-          sed -i "s/Example-Dependency = \"1.0.0\"//g" thunderstore.toml
-          sed -i "s/description = \"Example mod description\"/description = \"$TS_MOD_DESCRIPTION\"/g" thunderstore.toml
+          sed --in-place "s/communities = \[\]/communities = [\"$TS_COMMUNITY\"]/g" thunderstore.toml
+          sed --in-place "s/Example-Dependency = \"1.0.0\"//g" thunderstore.toml
+          sed --in-place "s/description = \"Example mod description\"/description = \"$TS_MOD_DESCRIPTION\"/g" thunderstore.toml
          cat thunderstore.toml

          tcli build
Author	SHA1	Message	Date
GeckoEidechse	8fdfdbd61a	Add Action to auto-label PRs with merge conflicts (#682 )	2024-08-09 13:22:51 +02:00
GeckoEidechse	767927fb92	Bump DiscordRPC plugin to v10 (#666 )	2024-07-06 02:30:35 +02:00
GeckoEidechse	7a72ecffcf	Bump softprops/action-gh-release action to v2 (#652 ) as v1 uses Node 16 which is being deprecated in a few months	2024-06-22 12:09:23 +02:00
GeckoEidechse	e7e2d55c9b	Bump upload/download artifact actions to v4 (#650 ) as v3 is being deprecated in a few months	2024-06-18 15:04:50 +02:00
GeckoEidechse	ada52bb828	Bump `cbrgm/mastodon-github-action` to v2 (#635 ) And update parameters accordingly	2024-03-03 12:22:12 +01:00
GeckoEidechse	86085f5c91	Bump CI runner to Ubuntu 22.04 (#627 )	2024-02-18 22:16:46 +01:00
GeckoEidechse	ad3601c607	Bump actions/checkout to v4 (#625 ) v3 uses Node 16 which is slated for deprecation by GitHub Actions	2024-02-06 16:39:25 +01:00
GeckoEidechse	904e6b00ef	Bump DiscordRPC to v9 (#622 ) Bumps DiscordRPC to match Plugin Interfaces / Plugins v4.	2024-02-04 03:37:37 +01:00
GeckoEidechse	4c0f02ba4f	Escape backticks in run command (#617 ) otherwise bash thinks we're trying to run the command "`"	2024-01-13 17:56:36 +01:00
GeckoEidechse	06f551ef71	Bump NorthstarNavs to v3 (#605 ) Co-authored-by: Zanieon <william-millennium@hotmail.com>	2023-12-20 13:13:25 +01:00
GeckoEidechse	ee9239f4ae	Rename Action from `Build` to `Release` (#585 ) to better reflect what it does	2023-12-14 15:00:26 +01:00
GeckoEidechse	cfc1498753	Calculate checksum twice (#591 ) build: Calculate checksum twice Instead of storing result in env var.	2023-11-19 22:32:32 +01:00
GeckoEidechse	abf59ba5fe	Print checksum to job summary (#589 ) Makes it easier to copy out for making PR to Docker image repo	2023-11-17 19:57:12 +01:00
GeckoEidechse	05a32ee30e	Bump DiscordRPC plugin to v6 (#587 )	2023-11-15 17:06:32 +01:00
GeckoEidechse	e595fa0a83	Use long form for cli args (#565 ) * Replace `mkdir`'s `-p` with `--parents` * Replace `rm`'s `-d` with `--dir` * Replace `mv`'s `-v` with `--verbose` * Replace `sed`'s `-i` with `--in-place` * Replace `wget`'s `-O` with `--output-document`	2023-11-07 16:42:36 +01:00