From b983600c3b014d2843abe93e618a1b52ac36aba0 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Wed, 22 Jul 2026 22:01:25 +0100 Subject: [PATCH 1/3] chore(sync): synced local '.github/' with remote 'general/.github/' (#4947) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Synced from dgibbs64/repo-sync@0a4246db6891a1188edd959ccec352e6c4149eb4 — Merge pull request #12 from dgibbs64/dependabot/npm_and_yarn/brace-expansion-5.0.7 chore(deps): bump brace-expansion from 5.0.6 to 5.0.7 --- .../workflows/action-dependabot-automerge.yml | 27 +++++++++++++++++ ...update-copyright-years-in-license-file.yml | 29 +++++++++++++++++++ 2 files changed, 56 insertions(+) create mode 100644 .github/workflows/action-dependabot-automerge.yml create mode 100644 .github/workflows/action-update-copyright-years-in-license-file.yml diff --git a/.github/workflows/action-dependabot-automerge.yml b/.github/workflows/action-dependabot-automerge.yml new file mode 100644 index 0000000000..9107d55650 --- /dev/null +++ b/.github/workflows/action-dependabot-automerge.yml @@ -0,0 +1,27 @@ +name: Dependabot auto-merge + +on: pull_request + +permissions: + contents: write + pull-requests: write + +jobs: + dependabot: + runs-on: ubuntu-latest + if: github.actor == 'dependabot[bot]' + steps: + - name: Fetch dependabot metadata + id: metadata + uses: dependabot/fetch-metadata@v2 + with: + github-token: "${{ secrets.GITHUB_TOKEN }}" + + - name: Approve and enable auto-merge for minor/patch updates + if: steps.metadata.outputs.update-type != 'version-update:semver-major' + env: + PR_URL: ${{ github.event.pull_request.html_url }} + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + run: | + gh pr review --approve "$PR_URL" + gh pr merge --auto --squash "$PR_URL" diff --git a/.github/workflows/action-update-copyright-years-in-license-file.yml b/.github/workflows/action-update-copyright-years-in-license-file.yml new file mode 100644 index 0000000000..ab1549f0e6 --- /dev/null +++ b/.github/workflows/action-update-copyright-years-in-license-file.yml @@ -0,0 +1,29 @@ +name: Update copyright year(s) in license file + +on: + workflow_dispatch: + schedule: + - cron: "0 3 1 1 *" # 03:00 AM on January 1 + +permissions: + contents: write + +jobs: + update-license-year: + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v6 + with: + fetch-depth: 0 + persist-credentials: false + - name: Action Update License Year + uses: FantasticFiasco/action-update-license-year@v3 + with: + token: ${{ secrets.GITHUB_TOKEN }} + path: LICENSE.md + - name: Merge pull request + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + run: | + gh pr merge --merge --delete-branch From fbe490b87be2fdaf1ace6ed570d830c7207e800a Mon Sep 17 00:00:00 2001 From: Doug Murphy <1383347+Doug-Murphy@users.noreply.github.com> Date: Fri, 18 Sep 2026 17:38:51 -0400 Subject: [PATCH 2/3] Update startparameters to load the latest server autosave Swap --start-server ${serverfiles}/save1.zip with --start-server-load-latest --- lgsm/config-default/config-lgsm/fctrserver/_default.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lgsm/config-default/config-lgsm/fctrserver/_default.cfg b/lgsm/config-default/config-lgsm/fctrserver/_default.cfg index ab885b5ea0..34d86d3ac0 100644 --- a/lgsm/config-default/config-lgsm/fctrserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/fctrserver/_default.cfg @@ -16,7 +16,7 @@ rconpassword="CHANGE_ME" branch="stable" # values: stable, experimental ## Server Parameters | https://docs.linuxgsm.com/configuration/start-parameters#additional-parameters -startparameters="--bind ${ip} --start-server ${serverfiles}/save1.zip --server-settings ${servercfgfullpath} --port ${port} --rcon-port ${rconport} --rcon-password ${rconpassword}" +startparameters="--bind ${ip} --start-server-load-latest --server-settings ${servercfgfullpath} --port ${port} --rcon-port ${rconport} --rcon-password ${rconpassword}" #### LinuxGSM Settings #### From 87938c26a2e8ea2e73029958dc139bafb60e380f Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sat, 3 Oct 2026 00:39:39 +0100 Subject: [PATCH 3/3] fix(fctr): create initial save in saves/ so load-latest finds it --start-server-load-latest only searches the saves directory. The initial save was created at ${serverfiles}/save1.zip, so a fresh install had no saves/ directory and failed to host ("cannot open directory"). Co-Authored-By: Claude Opus 5.5 --- lgsm/modules/install_factorio_save.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lgsm/modules/install_factorio_save.sh b/lgsm/modules/install_factorio_save.sh index 5dfb4758c1..ccaaa0615f 100755 --- a/lgsm/modules/install_factorio_save.sh +++ b/lgsm/modules/install_factorio_save.sh @@ -11,4 +11,6 @@ echo -e "" echo -e "${bold}${lightyellow}Creating initial Factorio savefile${default}" fn_messages_separator check_glibc.sh -"${executabledir}"/factorio --create "${serverfiles}/save1" +# Create the save in the saves directory so --start-server-load-latest can find it. +mkdir -p "${serverfiles}/saves" +"${executabledir}"/factorio --create "${serverfiles}/saves/save1"