From f063264c3cb4b558cfdfd9d19c9f0d71411da6df Mon Sep 17 00:00:00 2001 From: Adrienne Walker Date: Mon, 24 Apr 2023 12:06:35 -0700 Subject: [PATCH 1/9] ci: add test for sync_files Fixes #5221 --- .github/workflows/test-sync-files.yml | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 .github/workflows/test-sync-files.yml diff --git a/.github/workflows/test-sync-files.yml b/.github/workflows/test-sync-files.yml new file mode 100644 index 0000000000..677253870b --- /dev/null +++ b/.github/workflows/test-sync-files.yml @@ -0,0 +1,26 @@ +name: Sync Files Test + +on: + push: + branches: + - main + paths: + - 'ui/raidboss/**' + pull_request: + paths: + - 'ui/raidboss/**' + +jobs: + main: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - uses: ./.github/actions/setup-js-env + + - name: Run Sync Files + run: | + ts-node .util/sync_files.ts + + - name: Verify Unchanged + run: | + git diff --exit-code From cda94286da51dc0742b0643ab31530e3f8317336 Mon Sep 17 00:00:00 2001 From: Adrienne Walker Date: Mon, 24 Apr 2023 12:07:58 -0700 Subject: [PATCH 2/9] temp failure --- ui/raidboss/data/03-hw/trial/sophia-ex.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/raidboss/data/03-hw/trial/sophia-ex.ts b/ui/raidboss/data/03-hw/trial/sophia-ex.ts index b831db20bb..58614f0de8 100644 --- a/ui/raidboss/data/03-hw/trial/sophia-ex.ts +++ b/ui/raidboss/data/03-hw/trial/sophia-ex.ts @@ -12,7 +12,7 @@ export interface Data extends RaidbossData { isQuadrantSafe: { [id: string]: boolean }; seenThunder?: boolean; clonesActive?: boolean; - sadTethers?: boolean; // :C + sadTethers?: boolean; // :C // test fake string } const findSafeDir = (data: Data) => { From 4947e063a082ad301466ee45d18151db2a0113bd Mon Sep 17 00:00:00 2001 From: Adrienne Walker Date: Mon, 24 Apr 2023 12:24:28 -0700 Subject: [PATCH 3/9] add npm step --- .github/workflows/test-sync-files.yml | 8 ++------ package.json | 1 + 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/.github/workflows/test-sync-files.yml b/.github/workflows/test-sync-files.yml index 677253870b..d9a928f64b 100644 --- a/.github/workflows/test-sync-files.yml +++ b/.github/workflows/test-sync-files.yml @@ -17,10 +17,6 @@ jobs: - uses: actions/checkout@v3 - uses: ./.github/actions/setup-js-env - - name: Run Sync Files + - name: npm run sync-files run: | - ts-node .util/sync_files.ts - - - name: Verify Unchanged - run: | - git diff --exit-code + npm run sync-files diff --git a/package.json b/package.json index 10672ebc18..03046187c9 100644 --- a/package.json +++ b/package.json @@ -31,6 +31,7 @@ "stylelintfix": "stylelint --fix resources/**/*.css ui/**/*.css user/**/*.css test/**/*.css util/**/*.css", "markdownlint": "markdownlint . --ignore node_modules --ignore publish --ignore plugin/ThirdParty", "test": "mocha", + "sync-files": "ts-node util/sync_files.ts && git diff --quiet", "lint-staged": "lint-staged", "coverage-report": "ts-node util/gen_coverage_report.ts", "util": "ts-node util/index.ts", From e9c0e9229dcb0d2faa62dc14919a60bece36aacc Mon Sep 17 00:00:00 2001 From: Adrienne Walker Date: Mon, 24 Apr 2023 12:26:28 -0700 Subject: [PATCH 4/9] Revert "temp failure" This reverts commit cda94286da51dc0742b0643ab31530e3f8317336. --- ui/raidboss/data/03-hw/trial/sophia-ex.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/raidboss/data/03-hw/trial/sophia-ex.ts b/ui/raidboss/data/03-hw/trial/sophia-ex.ts index 58614f0de8..b831db20bb 100644 --- a/ui/raidboss/data/03-hw/trial/sophia-ex.ts +++ b/ui/raidboss/data/03-hw/trial/sophia-ex.ts @@ -12,7 +12,7 @@ export interface Data extends RaidbossData { isQuadrantSafe: { [id: string]: boolean }; seenThunder?: boolean; clonesActive?: boolean; - sadTethers?: boolean; // :C // test fake string + sadTethers?: boolean; // :C } const findSafeDir = (data: Data) => { From 19251389ca174c0740ffe15d852ca5e293cb597b Mon Sep 17 00:00:00 2001 From: Adrienne Walker Date: Mon, 24 Apr 2023 12:29:42 -0700 Subject: [PATCH 5/9] exit code --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 03046187c9..bd8c19f046 100644 --- a/package.json +++ b/package.json @@ -31,7 +31,7 @@ "stylelintfix": "stylelint --fix resources/**/*.css ui/**/*.css user/**/*.css test/**/*.css util/**/*.css", "markdownlint": "markdownlint . --ignore node_modules --ignore publish --ignore plugin/ThirdParty", "test": "mocha", - "sync-files": "ts-node util/sync_files.ts && git diff --quiet", + "sync-files": "ts-node util/sync_files.ts && git diff --exit-code", "lint-staged": "lint-staged", "coverage-report": "ts-node util/gen_coverage_report.ts", "util": "ts-node util/index.ts", From 38ad85de671e9a16baa4ab676c0d0dea346f48ed Mon Sep 17 00:00:00 2001 From: Adrienne Walker Date: Mon, 24 Apr 2023 12:32:11 -0700 Subject: [PATCH 6/9] more paths --- .github/workflows/test-sync-files.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/test-sync-files.yml b/.github/workflows/test-sync-files.yml index d9a928f64b..1610122896 100644 --- a/.github/workflows/test-sync-files.yml +++ b/.github/workflows/test-sync-files.yml @@ -6,9 +6,13 @@ on: - main paths: - 'ui/raidboss/**' + - '.github/workflows/test-sync-files.yml', + - 'package.json', pull_request: paths: - 'ui/raidboss/**' + - '.github/workflows/test-sync-files.yml', + - 'package.json', jobs: main: From 4bdbcd0ae8648bcee30a1c5f5c0aab32e0e5a70a Mon Sep 17 00:00:00 2001 From: Adrienne Walker Date: Mon, 24 Apr 2023 12:39:24 -0700 Subject: [PATCH 7/9] commas --- .github/workflows/test-sync-files.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test-sync-files.yml b/.github/workflows/test-sync-files.yml index 1610122896..ac6f9209a0 100644 --- a/.github/workflows/test-sync-files.yml +++ b/.github/workflows/test-sync-files.yml @@ -6,13 +6,13 @@ on: - main paths: - 'ui/raidboss/**' - - '.github/workflows/test-sync-files.yml', - - 'package.json', + - '.github/workflows/test-sync-files.yml' + - 'package.json' pull_request: paths: - 'ui/raidboss/**' - - '.github/workflows/test-sync-files.yml', - - 'package.json', + - '.github/workflows/test-sync-files.yml' + - 'package.json' jobs: main: From a1fcb9b6d63092739c75380710943165400bd413 Mon Sep 17 00:00:00 2001 From: Adrienne Walker Date: Mon, 24 Apr 2023 12:07:58 -0700 Subject: [PATCH 8/9] temp failure --- ui/raidboss/data/03-hw/trial/sophia-ex.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/raidboss/data/03-hw/trial/sophia-ex.ts b/ui/raidboss/data/03-hw/trial/sophia-ex.ts index b831db20bb..58614f0de8 100644 --- a/ui/raidboss/data/03-hw/trial/sophia-ex.ts +++ b/ui/raidboss/data/03-hw/trial/sophia-ex.ts @@ -12,7 +12,7 @@ export interface Data extends RaidbossData { isQuadrantSafe: { [id: string]: boolean }; seenThunder?: boolean; clonesActive?: boolean; - sadTethers?: boolean; // :C + sadTethers?: boolean; // :C // test fake string } const findSafeDir = (data: Data) => { From fc9d2a70e6a51260132e9358816430dc2de6d2fa Mon Sep 17 00:00:00 2001 From: Adrienne Walker Date: Mon, 24 Apr 2023 12:41:29 -0700 Subject: [PATCH 9/9] Revert "temp failure" This reverts commit a1fcb9b6d63092739c75380710943165400bd413. --- ui/raidboss/data/03-hw/trial/sophia-ex.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/raidboss/data/03-hw/trial/sophia-ex.ts b/ui/raidboss/data/03-hw/trial/sophia-ex.ts index 58614f0de8..b831db20bb 100644 --- a/ui/raidboss/data/03-hw/trial/sophia-ex.ts +++ b/ui/raidboss/data/03-hw/trial/sophia-ex.ts @@ -12,7 +12,7 @@ export interface Data extends RaidbossData { isQuadrantSafe: { [id: string]: boolean }; seenThunder?: boolean; clonesActive?: boolean; - sadTethers?: boolean; // :C // test fake string + sadTethers?: boolean; // :C } const findSafeDir = (data: Data) => {