From 4e9f5646503a36cf770a3924ff83a4029722718d Mon Sep 17 00:00:00 2001 From: DIBSTER <76603072+DEV-DIBSTER@users.noreply.github.com> Date: Fri, 20 Sep 2024 22:59:12 -0400 Subject: [PATCH 01/15] chore: create testing item --- sub-logs/testing.json | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 sub-logs/testing.json diff --git a/sub-logs/testing.json b/sub-logs/testing.json new file mode 100644 index 0000000..c8302a2 --- /dev/null +++ b/sub-logs/testing.json @@ -0,0 +1,14 @@ +{ + "repo": "https://github.com/DEV-DIBSTER/DEV-DIBSTER.github.io", + "owner": { + "username": "DEV-DIBSTER", + "email": "testing@gmail.com" + }, + "target": { + "CNAME": { + "name": "testing", + "value": "dev-dibster.github.io" + } + }, + "proxied": false +} From 0d478dfc06a23bee504b33cf6417c139b67ad83e Mon Sep 17 00:00:00 2001 From: DIBSTER <76603072+DEV-DIBSTER@users.noreply.github.com> Date: Fri, 20 Sep 2024 23:19:29 -0400 Subject: [PATCH 02/15] chore: testing --- .github/workflows/validation.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/validation.yml b/.github/workflows/validation.yml index 6fab734..488b299 100644 --- a/.github/workflows/validation.yml +++ b/.github/workflows/validation.yml @@ -43,3 +43,11 @@ jobs: proxy-url: https://is-a-good-dev-gh-proxy.talosbot.xyz/ repo-token-user-login: 'github-actions[bot]' # The user.login for temporary GitHub tokens allow-repeats: false # Default: false + +- name: Debug FILES + run: echo "${{ steps.changed-files.outputs.all_changed_files }}" + + + + + From 89a02f9595f68ec4b2091ed277a5f4b548f24207 Mon Sep 17 00:00:00 2001 From: DIBSTER <76603072+DEV-DIBSTER@users.noreply.github.com> Date: Fri, 20 Sep 2024 23:21:01 -0400 Subject: [PATCH 03/15] chore: slight edits --- sub-logs/{testing.json => testing123.json} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename sub-logs/{testing.json => testing123.json} (89%) diff --git a/sub-logs/testing.json b/sub-logs/testing123.json similarity index 89% rename from sub-logs/testing.json rename to sub-logs/testing123.json index c8302a2..7f03b52 100644 --- a/sub-logs/testing.json +++ b/sub-logs/testing123.json @@ -6,7 +6,7 @@ }, "target": { "CNAME": { - "name": "testing", + "name": "testing123", "value": "dev-dibster.github.io" } }, From 7acbd1f497d551ef5d4b37fa46b8f9a11baf9cab Mon Sep 17 00:00:00 2001 From: DIBSTER <76603072+DEV-DIBSTER@users.noreply.github.com> Date: Fri, 20 Sep 2024 23:23:41 -0400 Subject: [PATCH 04/15] Update validation.yml --- .github/workflows/validation.yml | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/.github/workflows/validation.yml b/.github/workflows/validation.yml index 488b299..a1bc13a 100644 --- a/.github/workflows/validation.yml +++ b/.github/workflows/validation.yml @@ -1,6 +1,3 @@ -name: Validation -on: [pull_request] - jobs: validation: runs-on: ubuntu-latest @@ -25,6 +22,9 @@ jobs: env: FILES: ${{ steps.changed-files.outputs.all_changed_files }} actions_path: ${{ github.workspace }} + - name: Debug FILES + if: steps.changed-files.outputs.any_changed == 'true' + run: echo "${{ steps.changed-files.outputs.all_changed_files }}" - name: Comment if: steps.tests.outputs.shouldComment == 'true' uses: mshick/add-pr-comment@v1 @@ -43,11 +43,3 @@ jobs: proxy-url: https://is-a-good-dev-gh-proxy.talosbot.xyz/ repo-token-user-login: 'github-actions[bot]' # The user.login for temporary GitHub tokens allow-repeats: false # Default: false - -- name: Debug FILES - run: echo "${{ steps.changed-files.outputs.all_changed_files }}" - - - - - From 6767bd11b3cb5c15d6723c9b4a4ed21c7e005e1a Mon Sep 17 00:00:00 2001 From: DIBSTER <76603072+DEV-DIBSTER@users.noreply.github.com> Date: Fri, 20 Sep 2024 23:24:32 -0400 Subject: [PATCH 05/15] chore: test --- sub-logs/testing123.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sub-logs/testing123.json b/sub-logs/testing123.json index 7f03b52..c8302a2 100644 --- a/sub-logs/testing123.json +++ b/sub-logs/testing123.json @@ -6,7 +6,7 @@ }, "target": { "CNAME": { - "name": "testing123", + "name": "testing", "value": "dev-dibster.github.io" } }, From af6e5d7944e42864dd2dba1a5416acfbcdd4dec6 Mon Sep 17 00:00:00 2001 From: DIBSTER <76603072+DEV-DIBSTER@users.noreply.github.com> Date: Fri, 20 Sep 2024 23:25:23 -0400 Subject: [PATCH 06/15] chore: update --- .github/workflows/validation.yml | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/.github/workflows/validation.yml b/.github/workflows/validation.yml index 488b299..d30ac5e 100644 --- a/.github/workflows/validation.yml +++ b/.github/workflows/validation.yml @@ -42,12 +42,4 @@ jobs: repo-token: ${{ secrets.GITHUB_TOKEN }} proxy-url: https://is-a-good-dev-gh-proxy.talosbot.xyz/ repo-token-user-login: 'github-actions[bot]' # The user.login for temporary GitHub tokens - allow-repeats: false # Default: false - -- name: Debug FILES - run: echo "${{ steps.changed-files.outputs.all_changed_files }}" - - - - - + allow-repeats: false # Default: false \ No newline at end of file From 914055b58ad9669ddbd80898fe8858bf5ed7b619 Mon Sep 17 00:00:00 2001 From: DIBSTER <76603072+DEV-DIBSTER@users.noreply.github.com> Date: Fri, 20 Sep 2024 23:28:45 -0400 Subject: [PATCH 07/15] Update validation.yml --- .github/workflows/validation.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/validation.yml b/.github/workflows/validation.yml index d30ac5e..7662725 100644 --- a/.github/workflows/validation.yml +++ b/.github/workflows/validation.yml @@ -42,4 +42,6 @@ jobs: repo-token: ${{ secrets.GITHUB_TOKEN }} proxy-url: https://is-a-good-dev-gh-proxy.talosbot.xyz/ repo-token-user-login: 'github-actions[bot]' # The user.login for temporary GitHub tokens - allow-repeats: false # Default: false \ No newline at end of file + allow-repeats: false # Default: false + - name: Debug any_changed + run: echo "${{ steps.changed-files.outputs.any_changed }}" From a08fe84a80ae1b3a76b65e1830cc5d40dc95dafc Mon Sep 17 00:00:00 2001 From: DIBSTER <76603072+DEV-DIBSTER@users.noreply.github.com> Date: Fri, 20 Sep 2024 23:37:21 -0400 Subject: [PATCH 08/15] chore: testing --- sub-logs/testing123.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sub-logs/testing123.json b/sub-logs/testing123.json index c8302a2..7f03b52 100644 --- a/sub-logs/testing123.json +++ b/sub-logs/testing123.json @@ -6,7 +6,7 @@ }, "target": { "CNAME": { - "name": "testing", + "name": "testing123", "value": "dev-dibster.github.io" } }, From 19c2811df947a096d757bf16b14cbbb82eec6789 Mon Sep 17 00:00:00 2001 From: DIBSTER <76603072+DEV-DIBSTER@users.noreply.github.com> Date: Fri, 20 Sep 2024 23:41:56 -0400 Subject: [PATCH 09/15] chore: moving debug somewhere --- .github/workflows/validation.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/validation.yml b/.github/workflows/validation.yml index 7662725..39094ae 100644 --- a/.github/workflows/validation.yml +++ b/.github/workflows/validation.yml @@ -8,6 +8,8 @@ jobs: - uses: actions/checkout@v3 with: fetch-depth: 0 + - name: Debug The Values + run: echo "${{ steps.changed-files.outputs.any_changed }}" - name: Get Files id: changed-files uses: tj-actions/changed-files@v34 @@ -43,5 +45,3 @@ jobs: proxy-url: https://is-a-good-dev-gh-proxy.talosbot.xyz/ repo-token-user-login: 'github-actions[bot]' # The user.login for temporary GitHub tokens allow-repeats: false # Default: false - - name: Debug any_changed - run: echo "${{ steps.changed-files.outputs.any_changed }}" From 417daaf03afe9ff0333884b29b05798b34150bcd Mon Sep 17 00:00:00 2001 From: DIBSTER <76603072+DEV-DIBSTER@users.noreply.github.com> Date: Fri, 20 Sep 2024 23:46:24 -0400 Subject: [PATCH 10/15] chore: fixing validation --- .github/workflows/validation.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/validation.yml b/.github/workflows/validation.yml index 39094ae..d647c88 100644 --- a/.github/workflows/validation.yml +++ b/.github/workflows/validation.yml @@ -8,8 +8,6 @@ jobs: - uses: actions/checkout@v3 with: fetch-depth: 0 - - name: Debug The Values - run: echo "${{ steps.changed-files.outputs.any_changed }}" - name: Get Files id: changed-files uses: tj-actions/changed-files@v34 @@ -17,6 +15,8 @@ jobs: files: | sub-logs/** reserved/** + - name: Debug The Values + run: echo "${{ steps.changed-files.outputs.any_changed }}" - name: Install Modules if: steps.changed-files.outputs.any_changed == 'true' run: yarn From 9f87e07da564b9820ea3d2a21de22555aaa0667b Mon Sep 17 00:00:00 2001 From: DIBSTER <76603072+DEV-DIBSTER@users.noreply.github.com> Date: Fri, 20 Sep 2024 23:58:42 -0400 Subject: [PATCH 11/15] chore: fixing --- utils/getFileName.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/utils/getFileName.js b/utils/getFileName.js index 9bf698a..508fe66 100644 --- a/utils/getFileName.js +++ b/utils/getFileName.js @@ -7,7 +7,7 @@ function getFileName(file, data) { // Validate if the file name matches any of the target.RECORD_TYPE values const recordTypes = Object.values(data.target); - return recordTypes[0].name == fileNameWithoutExt.toLowerCase(); + return recordTypes[0].name == fileNameWithoutExt.toLowerCase().split("/")[1]; } -module.exports = getFileName; \ No newline at end of file +module.exports = getFileName; From 7f30441ef148466e530c95c98f754acc81cb67d3 Mon Sep 17 00:00:00 2001 From: DIBSTER <76603072+DEV-DIBSTER@users.noreply.github.com> Date: Fri, 20 Sep 2024 23:59:43 -0400 Subject: [PATCH 12/15] chore: last test --- sub-logs/{testing123.json => testing246.json} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename sub-logs/{testing123.json => testing246.json} (89%) diff --git a/sub-logs/testing123.json b/sub-logs/testing246.json similarity index 89% rename from sub-logs/testing123.json rename to sub-logs/testing246.json index 7f03b52..55efc7d 100644 --- a/sub-logs/testing123.json +++ b/sub-logs/testing246.json @@ -6,7 +6,7 @@ }, "target": { "CNAME": { - "name": "testing123", + "name": "testing246", "value": "dev-dibster.github.io" } }, From d7d29d42f0a593f84a6a03f3750419098233fb15 Mon Sep 17 00:00:00 2001 From: DIBSTER <76603072+DEV-DIBSTER@users.noreply.github.com> Date: Sat, 21 Sep 2024 00:00:49 -0400 Subject: [PATCH 13/15] chore: testing --- sub-logs/testing246.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sub-logs/testing246.json b/sub-logs/testing246.json index 55efc7d..7f03b52 100644 --- a/sub-logs/testing246.json +++ b/sub-logs/testing246.json @@ -6,7 +6,7 @@ }, "target": { "CNAME": { - "name": "testing246", + "name": "testing123", "value": "dev-dibster.github.io" } }, From 310a47f83eea48f15bd6addb98d9ced054837aae Mon Sep 17 00:00:00 2001 From: DIBSTER <76603072+DEV-DIBSTER@users.noreply.github.com> Date: Sat, 21 Sep 2024 00:02:26 -0400 Subject: [PATCH 14/15] chore: testing items --- .github/workflows/validation.yml | 2 -- sub-logs/testing246.json | 2 +- tests/json.test.js | 1 - 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/validation.yml b/.github/workflows/validation.yml index d647c88..6fab734 100644 --- a/.github/workflows/validation.yml +++ b/.github/workflows/validation.yml @@ -15,8 +15,6 @@ jobs: files: | sub-logs/** reserved/** - - name: Debug The Values - run: echo "${{ steps.changed-files.outputs.any_changed }}" - name: Install Modules if: steps.changed-files.outputs.any_changed == 'true' run: yarn diff --git a/sub-logs/testing246.json b/sub-logs/testing246.json index 7f03b52..55efc7d 100644 --- a/sub-logs/testing246.json +++ b/sub-logs/testing246.json @@ -6,7 +6,7 @@ }, "target": { "CNAME": { - "name": "testing123", + "name": "testing246", "value": "dev-dibster.github.io" } }, diff --git a/tests/json.test.js b/tests/json.test.js index 10bfd1d..c185eea 100644 --- a/tests/json.test.js +++ b/tests/json.test.js @@ -57,6 +57,5 @@ test('Check if JSON file matches the value name', () => { let fileNameMessage = passed === true ? "File name matches target.RECORD_TYPE." : "File name does not match any target.RECORD_TYPE."; core.setOutput('fileNameMessage', fileNameMessage); - expect(typeof passed).toBe('boolean'); // Check if the result is a boolean expect(passed).toBe(true); }); From 0a4533a02302514d9018ea8c21b62fefbc0731d6 Mon Sep 17 00:00:00 2001 From: DIBSTER <76603072+DEV-DIBSTER@users.noreply.github.com> Date: Sat, 21 Sep 2024 00:05:06 -0400 Subject: [PATCH 15/15] chore: removing testing file --- sub-logs/testing246.json | 14 -------------- 1 file changed, 14 deletions(-) delete mode 100644 sub-logs/testing246.json diff --git a/sub-logs/testing246.json b/sub-logs/testing246.json deleted file mode 100644 index 55efc7d..0000000 --- a/sub-logs/testing246.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "repo": "https://github.com/DEV-DIBSTER/DEV-DIBSTER.github.io", - "owner": { - "username": "DEV-DIBSTER", - "email": "testing@gmail.com" - }, - "target": { - "CNAME": { - "name": "testing246", - "value": "dev-dibster.github.io" - } - }, - "proxied": false -}