From b30ae775524b4cd0f95ce9147338d5097f1c76c0 Mon Sep 17 00:00:00 2001 From: Jeremiah Corrado Date: Wed, 8 May 2024 08:25:27 -0600 Subject: [PATCH 01/10] remove ssh->html step of CI setup Signed-off-by: Jeremiah Corrado --- util/runMasonCI.bash | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/util/runMasonCI.bash b/util/runMasonCI.bash index 6a9f517..b30c871 100755 --- a/util/runMasonCI.bash +++ b/util/runMasonCI.bash @@ -1,7 +1,7 @@ #!/usr/bin/env bash # Clones master of chapel and quickstarts with CHPL_REGEXP=re2 -git clone --depth=1 --branch=main https://github.com/chapel-lang/chapel.git +git clone --depth=1 --branch=main git@github.com:chapel-lang/chapel.git buildChapel () { cd chapel || exit 1 @@ -57,4 +57,3 @@ mason update mason publish --ci-check exit $? - From 36772e7a92045fd2fbb18f420b27d1cadf45d8b8 Mon Sep 17 00:00:00 2001 From: Jeremiah Corrado Date: Wed, 8 May 2024 08:25:46 -0600 Subject: [PATCH 02/10] remove ssh->html step of CI setup Signed-off-by: Jeremiah Corrado --- .github/workflows/masonRegCI.yaml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.github/workflows/masonRegCI.yaml b/.github/workflows/masonRegCI.yaml index f39c946..743ff64 100644 --- a/.github/workflows/masonRegCI.yaml +++ b/.github/workflows/masonRegCI.yaml @@ -15,11 +15,6 @@ jobs: - name: Run checkTomlScript run: | bash ./checkTomls.bash - - name: Reconfigure git to use HTTPS - run: > - git config --global url."https://github.com/".insteadof - ssh://git@github.com/ - name: CI Check package run: | bash ./util/runMasonCI.bash - From 4052f4865504bd76262df52f965fcba292d03478 Mon Sep 17 00:00:00 2001 From: Jeremiah Corrado Date: Wed, 8 May 2024 08:27:55 -0600 Subject: [PATCH 03/10] add a file to Bricks to trigger CI check Signed-off-by: Jeremiah Corrado --- Bricks/useless_file.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 Bricks/useless_file.txt diff --git a/Bricks/useless_file.txt b/Bricks/useless_file.txt new file mode 100644 index 0000000..e69de29 From 2bfaf24afa8d2228c66b642089a7942255a87f3d Mon Sep 17 00:00:00 2001 From: Jeremiah Corrado Date: Wed, 8 May 2024 08:31:21 -0600 Subject: [PATCH 04/10] remove useless file Signed-off-by: Jeremiah Corrado --- Bricks/_MasonTest1/0.2.0.toml | 2 +- Bricks/useless_file.txt | 0 2 files changed, 1 insertion(+), 1 deletion(-) delete mode 100644 Bricks/useless_file.txt diff --git a/Bricks/_MasonTest1/0.2.0.toml b/Bricks/_MasonTest1/0.2.0.toml index da4cc7a..e0d65d1 100644 --- a/Bricks/_MasonTest1/0.2.0.toml +++ b/Bricks/_MasonTest1/0.2.0.toml @@ -2,7 +2,7 @@ [brick] name = "_MasonTest1" version = "0.2.0" -chplVersion = "1.16.0" +chplVersion = "1.17.0" author = "Sam Partee" source = "https://github.com/Spartee/_MasonTest1" diff --git a/Bricks/useless_file.txt b/Bricks/useless_file.txt deleted file mode 100644 index e69de29..0000000 From 7ff08900bc7812af4f7d176b4298cee0f3e4d1ba Mon Sep 17 00:00:00 2001 From: Jeremiah Corrado Date: Wed, 8 May 2024 08:36:13 -0600 Subject: [PATCH 05/10] try to use more robust ssh->https switch Signed-off-by: Jeremiah Corrado --- .github/workflows/masonRegCI.yaml | 4 ++++ util/runMasonCI.bash | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/masonRegCI.yaml b/.github/workflows/masonRegCI.yaml index 743ff64..b24920c 100644 --- a/.github/workflows/masonRegCI.yaml +++ b/.github/workflows/masonRegCI.yaml @@ -15,6 +15,10 @@ jobs: - name: Run checkTomlScript run: | bash ./checkTomls.bash + - name: Reconfigure git to use HTTPS + run: | + git config --global url."https://github.com/".insteadOf git@github.com: + git config --global url."https://".insteadOf git:// - name: CI Check package run: | bash ./util/runMasonCI.bash diff --git a/util/runMasonCI.bash b/util/runMasonCI.bash index b30c871..05a15d8 100755 --- a/util/runMasonCI.bash +++ b/util/runMasonCI.bash @@ -1,7 +1,7 @@ #!/usr/bin/env bash # Clones master of chapel and quickstarts with CHPL_REGEXP=re2 -git clone --depth=1 --branch=main git@github.com:chapel-lang/chapel.git +git clone --depth=1 --branch=main https://github.com/chapel-lang/chapel.git buildChapel () { cd chapel || exit 1 From 993c03cb9e9ca4b569263f09f6d09cd77083bd71 Mon Sep 17 00:00:00 2001 From: Jeremiah Corrado Date: Wed, 8 May 2024 09:08:16 -0600 Subject: [PATCH 06/10] revert change to toml file Signed-off-by: Jeremiah Corrado --- Bricks/_MasonTest1/0.2.0.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Bricks/_MasonTest1/0.2.0.toml b/Bricks/_MasonTest1/0.2.0.toml index e0d65d1..da4cc7a 100644 --- a/Bricks/_MasonTest1/0.2.0.toml +++ b/Bricks/_MasonTest1/0.2.0.toml @@ -2,7 +2,7 @@ [brick] name = "_MasonTest1" version = "0.2.0" -chplVersion = "1.17.0" +chplVersion = "1.16.0" author = "Sam Partee" source = "https://github.com/Spartee/_MasonTest1" From 64df3f444c71b8d9305781a1966b900c0b2bb46f Mon Sep 17 00:00:00 2001 From: Jeremiah Corrado Date: Wed, 8 May 2024 09:10:54 -0600 Subject: [PATCH 07/10] add hopefully innocuous change to toml file to trigger CI check Signed-off-by: Jeremiah Corrado --- Bricks/_MasonTest1/0.2.0.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/Bricks/_MasonTest1/0.2.0.toml b/Bricks/_MasonTest1/0.2.0.toml index da4cc7a..dccaee1 100644 --- a/Bricks/_MasonTest1/0.2.0.toml +++ b/Bricks/_MasonTest1/0.2.0.toml @@ -5,5 +5,6 @@ version = "0.2.0" chplVersion = "1.16.0" author = "Sam Partee" source = "https://github.com/Spartee/_MasonTest1" +x = "" [dependencies] From c841bbbcbf29e67a0ea4505804308af37e061910 Mon Sep 17 00:00:00 2001 From: Jeremiah Corrado Date: Wed, 8 May 2024 09:56:07 -0600 Subject: [PATCH 08/10] revert change to toml file - trigger CI regardless of change Signed-off-by: Jeremiah Corrado --- .github/workflows/masonRegCI.yaml | 4 ++-- Bricks/_MasonTest1/0.2.0.toml | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/masonRegCI.yaml b/.github/workflows/masonRegCI.yaml index b24920c..770c37f 100644 --- a/.github/workflows/masonRegCI.yaml +++ b/.github/workflows/masonRegCI.yaml @@ -1,8 +1,8 @@ name: Mason Registry CI on: pull_request: - paths: - - 'Bricks/**' + # paths: + # - 'Bricks/**' jobs: checks_for_package: name: Check Package diff --git a/Bricks/_MasonTest1/0.2.0.toml b/Bricks/_MasonTest1/0.2.0.toml index dccaee1..da4cc7a 100644 --- a/Bricks/_MasonTest1/0.2.0.toml +++ b/Bricks/_MasonTest1/0.2.0.toml @@ -5,6 +5,5 @@ version = "0.2.0" chplVersion = "1.16.0" author = "Sam Partee" source = "https://github.com/Spartee/_MasonTest1" -x = "" [dependencies] From 0b810a86f7ccc3bdc2583a79f46bcbe434d08cfd Mon Sep 17 00:00:00 2001 From: Jeremiah Corrado Date: Wed, 8 May 2024 10:23:04 -0600 Subject: [PATCH 09/10] debug print package name Signed-off-by: Jeremiah Corrado --- util/runMasonCI.bash | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/util/runMasonCI.bash b/util/runMasonCI.bash index 05a15d8..ff99471 100755 --- a/util/runMasonCI.bash +++ b/util/runMasonCI.bash @@ -4,22 +4,22 @@ git clone --depth=1 --branch=main https://github.com/chapel-lang/chapel.git buildChapel () { - cd chapel || exit 1 - source util/quickstart/setchplenv.bash - export CHPL_REGEXP=re2 - export CHPL_RE2=bundled - make + # cd chapel || exit 1 + # source util/quickstart/setchplenv.bash + # export CHPL_REGEXP=re2 + # export CHPL_RE2=bundled + # make } # Runs a make check, and if it passes then makes mason makeCheckAndMason () { - make check - output=$? - if [ ${output} -eq 0 ]; then - make mason - else - exit 1 - fi + # make check + # output=$? + # if [ ${output} -eq 0 ]; then + # make mason + # else + # exit 1 + # fi } # Parses the last merge commit, getting the most recent package added to the registry @@ -28,6 +28,7 @@ checkPackage () { package=$(git diff --name-only HEAD HEAD~1) end=".end" path="$package$end" + echo $path cd "$(dirname "$path")" || exit 1 echo "package detected from git diff: ${package}" echo "package path: ${path}" From 874e49326f9ac2bc6950b4d5155dd3700694eb05 Mon Sep 17 00:00:00 2001 From: Jeremiah Corrado Date: Wed, 8 May 2024 10:24:32 -0600 Subject: [PATCH 10/10] debug print package name Signed-off-by: Jeremiah Corrado --- util/runMasonCI.bash | 2 ++ 1 file changed, 2 insertions(+) diff --git a/util/runMasonCI.bash b/util/runMasonCI.bash index ff99471..663bf26 100755 --- a/util/runMasonCI.bash +++ b/util/runMasonCI.bash @@ -9,6 +9,7 @@ buildChapel () { # export CHPL_REGEXP=re2 # export CHPL_RE2=bundled # make + echo "yep" } # Runs a make check, and if it passes then makes mason @@ -20,6 +21,7 @@ makeCheckAndMason () { # else # exit 1 # fi + echo "yep" } # Parses the last merge commit, getting the most recent package added to the registry