From 1f1da3237196ed5361a2b4c31aa74f8ab02c0fc0 Mon Sep 17 00:00:00 2001 From: Chocobo1 Date: Sat, 22 Apr 2023 02:52:54 +0800 Subject: [PATCH 1/4] Rename CI script See: https://stackoverflow.com/questions/22268952/what-is-the-difference-between-yaml-and-yml-extension --- .github/workflows/{coverity-scan.yml => coverity-scan.yaml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .github/workflows/{coverity-scan.yml => coverity-scan.yaml} (100%) diff --git a/.github/workflows/coverity-scan.yml b/.github/workflows/coverity-scan.yaml similarity index 100% rename from .github/workflows/coverity-scan.yml rename to .github/workflows/coverity-scan.yaml From 69df85f564513b706c957c2b46da19e3d6b24439 Mon Sep 17 00:00:00 2001 From: Chocobo1 Date: Sat, 22 Apr 2023 02:55:21 +0800 Subject: [PATCH 2/4] Move script into its own subfolder --- .../workflows/{ => helper/pre-commit}/check_translation_tag.py | 0 .pre-commit-config.yaml | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename .github/workflows/{ => helper/pre-commit}/check_translation_tag.py (100%) diff --git a/.github/workflows/check_translation_tag.py b/.github/workflows/helper/pre-commit/check_translation_tag.py similarity index 100% rename from .github/workflows/check_translation_tag.py rename to .github/workflows/helper/pre-commit/check_translation_tag.py diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 76a59ff43..fae9fb8e1 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -3,7 +3,7 @@ repos: hooks: - id: check-translation-tag name: Check newline characters in tag - entry: .github/workflows/check_translation_tag.py + entry: .github/workflows/helper/pre-commit/check_translation_tag.py language: script exclude: | (?x)^( From 3b7285998067403d80f2b5883bdce564edae4502 Mon Sep 17 00:00:00 2001 From: Chocobo1 Date: Sat, 22 Apr 2023 03:01:43 +0800 Subject: [PATCH 3/4] Bump various action versions --- .github/workflows/stale_bot.yaml | 2 +- .pre-commit-config.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/stale_bot.yaml b/.github/workflows/stale_bot.yaml index 93fad6070..d5b23095f 100644 --- a/.github/workflows/stale_bot.yaml +++ b/.github/workflows/stale_bot.yaml @@ -12,7 +12,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Mark and close stale PRs - uses: actions/stale@v5 + uses: actions/stale@v8 with: stale-pr-message: "This PR is stale because it has been 60 days with no activity. This PR will be automatically closed within 7 days if there is no further activity." close-pr-message: "This PR was closed because it has been stalled for some time with no activity." diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index fae9fb8e1..b68220ef4 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -13,7 +13,7 @@ repos: - ts - repo: https://github.com/pre-commit/pre-commit-hooks.git - rev: v4.3.0 + rev: v4.4.0 hooks: - id: check-json name: Check JSON files From df895cb2a733c7e7f64ff65075ee64398b95f5d1 Mon Sep 17 00:00:00 2001 From: Chocobo1 Date: Mon, 24 Apr 2023 13:22:53 +0800 Subject: [PATCH 4/4] Improve script compatibility Now the script is conforms to POSIX shell script which is universal on all linux. Also make it executable. --- .github/workflows/helper/appimage/export_vars.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) mode change 100644 => 100755 .github/workflows/helper/appimage/export_vars.sh diff --git a/.github/workflows/helper/appimage/export_vars.sh b/.github/workflows/helper/appimage/export_vars.sh old mode 100644 new mode 100755 index cbedc852e..d23b2166c --- a/.github/workflows/helper/appimage/export_vars.sh +++ b/.github/workflows/helper/appimage/export_vars.sh @@ -1,10 +1,12 @@ +#!/bin/sh + # this file is called from AppRun so 'root_dir' will point to where AppRun is root_dir="$(readlink -f "$(dirname "$0")")" # Insert the default values because after the test we prepend our path # and it will create problems with DEs (eg KDE) that don't set the variable # and rely on the default paths -if [[ -z ${XDG_DATA_DIRS} ]]; then +if [ -z "${XDG_DATA_DIRS}" ]; then XDG_DATA_DIRS="/usr/local/share/:/usr/share/" fi