From 661d4b1fc415b95aff32f8dfd2b8e5b367553635 Mon Sep 17 00:00:00 2001 From: Wilgert Velinga Date: Sat, 1 Feb 2020 15:07:59 +0100 Subject: [PATCH 01/24] add GitHub Actions main.yml --- .github/workflows/main.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 .github/workflows/main.yml diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml new file mode 100644 index 000000000..5e4c001cc --- /dev/null +++ b/.github/workflows/main.yml @@ -0,0 +1,18 @@ +name: CheckHomework + +on: [push] + +jobs: + build: + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + - name: Run a one-line script + run: echo Hello, world! + - name: Current Branch + uses: ryolambert/current-branch@v1.0 + - name: Run a multi-line script + run: | + echo Add other actions to build, + echo test, and deploy your project. From fad77611b8e7ecd06df8e527a3a1069bbc6515d3 Mon Sep 17 00:00:00 2001 From: Wilgert Velinga Date: Sat, 1 Feb 2020 15:12:36 +0100 Subject: [PATCH 02/24] use different branchname plugin --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 5e4c001cc..2ddde578f 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -10,8 +10,8 @@ jobs: - uses: actions/checkout@v2 - name: Run a one-line script run: echo Hello, world! - - name: Current Branch - uses: ryolambert/current-branch@v1.0 + - uses: nelonoel/branch-name@v1 + - run: echo ${BRANCH_NAME} - name: Run a multi-line script run: | echo Add other actions to build, From eda02d01d4a10f5b7d970aaae9549403ad81a8ba Mon Sep 17 00:00:00 2001 From: Wilgert Velinga Date: Sat, 1 Feb 2020 15:21:17 +0100 Subject: [PATCH 03/24] grep weeknumber --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 2ddde578f..476ba4995 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -8,10 +8,10 @@ jobs: steps: - uses: actions/checkout@v2 + - uses: nelonoel/branch-name@v1 - name: Run a one-line script run: echo Hello, world! - - uses: nelonoel/branch-name@v1 - - run: echo ${BRANCH_NAME} + - run: echo ${BRANCH_NAME} | grep -P -q '/w(?:eek)?[-_]?(\d{1})/' - name: Run a multi-line script run: | echo Add other actions to build, From 69298093b72ac45095f3d3e5cfd337405ca9f3c2 Mon Sep 17 00:00:00 2001 From: Wilgert Velinga Date: Sat, 1 Feb 2020 15:40:13 +0100 Subject: [PATCH 04/24] use sed instead of grep --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 476ba4995..d67bc15a8 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -11,7 +11,7 @@ jobs: - uses: nelonoel/branch-name@v1 - name: Run a one-line script run: echo Hello, world! - - run: echo ${BRANCH_NAME} | grep -P -q '/w(?:eek)?[-_]?(\d{1})/' + - run: echo ${BRANCH_NAME} | sed 's/w(?:eek)?[-_]?(\d{1})/' - name: Run a multi-line script run: | echo Add other actions to build, From 1f99c09f708c1ee38a9425e06e430ce96efb38f3 Mon Sep 17 00:00:00 2001 From: Wilgert Velinga Date: Sat, 1 Feb 2020 15:53:12 +0100 Subject: [PATCH 05/24] use sed -E plus substitution --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d67bc15a8..8f4cd3492 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -11,7 +11,7 @@ jobs: - uses: nelonoel/branch-name@v1 - name: Run a one-line script run: echo Hello, world! - - run: echo ${BRANCH_NAME} | sed 's/w(?:eek)?[-_]?(\d{1})/' + - run: echo ${BRANCH_NAME} sed -E 's/.*w(eek)?[-_]?([0-9]).*/Week\2/gi' - name: Run a multi-line script run: | echo Add other actions to build, From f1d546236aedcea90ee781e2acfecd259dc35bf5 Mon Sep 17 00:00:00 2001 From: Wilgert Velinga Date: Sat, 1 Feb 2020 15:56:45 +0100 Subject: [PATCH 06/24] rename step --- .github/workflows/main.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 8f4cd3492..1da3cabcd 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -9,9 +9,8 @@ jobs: steps: - uses: actions/checkout@v2 - uses: nelonoel/branch-name@v1 - - name: Run a one-line script - run: echo Hello, world! - - run: echo ${BRANCH_NAME} sed -E 's/.*w(eek)?[-_]?([0-9]).*/Week\2/gi' + - name: Echo week folder + run: echo ${BRANCH_NAME} sed -E 's/.*w(eek)?[-_]?([0-9]).*/Week\2/gi' - name: Run a multi-line script run: | echo Add other actions to build, From b177b2fe95590c1a99e12d47a13603f7b8e25751 Mon Sep 17 00:00:00 2001 From: Wilgert Velinga Date: Sat, 1 Feb 2020 15:57:37 +0100 Subject: [PATCH 07/24] add pipe --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 1da3cabcd..d6acd3404 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -10,7 +10,7 @@ jobs: - uses: actions/checkout@v2 - uses: nelonoel/branch-name@v1 - name: Echo week folder - run: echo ${BRANCH_NAME} sed -E 's/.*w(eek)?[-_]?([0-9]).*/Week\2/gi' + run: echo ${BRANCH_NAME} | sed -E 's/.*w(eek)?[-_]?([0-9]).*/Week\2/gi' - name: Run a multi-line script run: | echo Add other actions to build, From e50e6db69968712ff8a6efdc3d5c43bbfdd504f6 Mon Sep 17 00:00:00 2001 From: Wilgert Velinga Date: Sat, 1 Feb 2020 16:01:28 +0100 Subject: [PATCH 08/24] echo --- .github/workflows/main.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d6acd3404..04526573e 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -10,8 +10,6 @@ jobs: - uses: actions/checkout@v2 - uses: nelonoel/branch-name@v1 - name: Echo week folder - run: echo ${BRANCH_NAME} | sed -E 's/.*w(eek)?[-_]?([0-9]).*/Week\2/gi' - - name: Run a multi-line script run: | - echo Add other actions to build, - echo test, and deploy your project. + export WEEK_FOLDER=$(echo ${BRANCH_NAME} | sed -E 's/.*w(eek)?[-_]?([0-9]).*/Week\2/gi') + echo ${WEEK_FOLDER} From cbfa3cec337da7ad5e2fb8fd1d92285e81152b07 Mon Sep 17 00:00:00 2001 From: Wilgert Velinga Date: Sat, 1 Feb 2020 16:04:10 +0100 Subject: [PATCH 09/24] setup node --- .github/workflows/main.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 04526573e..55661dcd1 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -13,3 +13,6 @@ jobs: run: | export WEEK_FOLDER=$(echo ${BRANCH_NAME} | sed -E 's/.*w(eek)?[-_]?([0-9]).*/Week\2/gi') echo ${WEEK_FOLDER} + - uses: actions/setup-node@v1 + with: + node-version: '10.x' From 1a0114979a004e72f4e37e01fc992c541254faec Mon Sep 17 00:00:00 2001 From: Wilgert Velinga Date: Sat, 1 Feb 2020 16:05:10 +0100 Subject: [PATCH 10/24] use non capturing group --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 55661dcd1..6764124ad 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -11,7 +11,7 @@ jobs: - uses: nelonoel/branch-name@v1 - name: Echo week folder run: | - export WEEK_FOLDER=$(echo ${BRANCH_NAME} | sed -E 's/.*w(eek)?[-_]?([0-9]).*/Week\2/gi') + export WEEK_FOLDER=$(echo ${BRANCH_NAME} | sed -E 's/.*w(?:eek)?[-_]?([0-9]).*/Week\1/gi') echo ${WEEK_FOLDER} - uses: actions/setup-node@v1 with: From 7834a316560e4ce491e9bb6cd07a40cd235b497a Mon Sep 17 00:00:00 2001 From: Wilgert Velinga Date: Sat, 1 Feb 2020 16:08:38 +0100 Subject: [PATCH 11/24] REVERT: use non capturing group --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 6764124ad..55661dcd1 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -11,7 +11,7 @@ jobs: - uses: nelonoel/branch-name@v1 - name: Echo week folder run: | - export WEEK_FOLDER=$(echo ${BRANCH_NAME} | sed -E 's/.*w(?:eek)?[-_]?([0-9]).*/Week\1/gi') + export WEEK_FOLDER=$(echo ${BRANCH_NAME} | sed -E 's/.*w(eek)?[-_]?([0-9]).*/Week\2/gi') echo ${WEEK_FOLDER} - uses: actions/setup-node@v1 with: From 0c3963791574220d157b6cefedd75c79ef46106d Mon Sep 17 00:00:00 2001 From: Wilgert Velinga Date: Sat, 1 Feb 2020 16:13:07 +0100 Subject: [PATCH 12/24] run test --- .github/workflows/main.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 55661dcd1..7140a70f9 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -11,8 +11,10 @@ jobs: - uses: nelonoel/branch-name@v1 - name: Echo week folder run: | - export WEEK_FOLDER=$(echo ${BRANCH_NAME} | sed -E 's/.*w(eek)?[-_]?([0-9]).*/Week\2/gi') + export WEEK_FOLDER=$(echo ${BRANCH_NAME} | sed -E 's/.*w(eek)?[-_]?([0-9]).*/week\2/gi') echo ${WEEK_FOLDER} - uses: actions/setup-node@v1 with: node-version: '10.x' + - run: npm install + - run: npm run test-${WEEK_FOLDER} From e18d904cd24c2df1633548dbb45389ae756996b5 Mon Sep 17 00:00:00 2001 From: Wilgert Velinga Date: Sat, 1 Feb 2020 16:15:03 +0100 Subject: [PATCH 13/24] remove {} around WEEK_FOLDER --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 7140a70f9..8dad84b5f 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -17,4 +17,4 @@ jobs: with: node-version: '10.x' - run: npm install - - run: npm run test-${WEEK_FOLDER} + - run: npm run test-$WEEK_FOLDER From dfb3500edadb2a967b85a88981eef0df29d9b0cc Mon Sep 17 00:00:00 2001 From: Wilgert Velinga Date: Sat, 1 Feb 2020 16:17:24 +0100 Subject: [PATCH 14/24] npm run test inside multiline command --- .github/workflows/main.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 8dad84b5f..bc15b136c 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -9,12 +9,12 @@ jobs: steps: - uses: actions/checkout@v2 - uses: nelonoel/branch-name@v1 - - name: Echo week folder - run: | - export WEEK_FOLDER=$(echo ${BRANCH_NAME} | sed -E 's/.*w(eek)?[-_]?([0-9]).*/week\2/gi') - echo ${WEEK_FOLDER} - uses: actions/setup-node@v1 with: node-version: '10.x' - run: npm install - - run: npm run test-$WEEK_FOLDER + - name: Echo week folder and run tests + run: | + export WEEK_FOLDER=$(echo ${BRANCH_NAME} | sed -E 's/.*w(eek)?[-_]?([0-9]).*/week\2/gi') + echo ${WEEK_FOLDER}\ + npm run test-${WEEK_FOLDER} From ab830a6c18aa3aebf352aa1aa73dd2bdb7f3ef10 Mon Sep 17 00:00:00 2001 From: Wilgert Velinga Date: Sat, 1 Feb 2020 16:19:36 +0100 Subject: [PATCH 15/24] remove slash that destroys everything --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index bc15b136c..a3d911c7a 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -16,5 +16,5 @@ jobs: - name: Echo week folder and run tests run: | export WEEK_FOLDER=$(echo ${BRANCH_NAME} | sed -E 's/.*w(eek)?[-_]?([0-9]).*/week\2/gi') - echo ${WEEK_FOLDER}\ + echo ${WEEK_FOLDER} npm run test-${WEEK_FOLDER} From 342f81548decc6d34bd392c323c8e126af1f8404 Mon Sep 17 00:00:00 2001 From: Wilgert Velinga Date: Sat, 1 Feb 2020 16:23:28 +0100 Subject: [PATCH 16/24] rename WEEK_FOLDER -> WEEK --- .github/workflows/main.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index a3d911c7a..7caf4caf9 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -15,6 +15,6 @@ jobs: - run: npm install - name: Echo week folder and run tests run: | - export WEEK_FOLDER=$(echo ${BRANCH_NAME} | sed -E 's/.*w(eek)?[-_]?([0-9]).*/week\2/gi') - echo ${WEEK_FOLDER} - npm run test-${WEEK_FOLDER} + export WEEK=$(echo ${BRANCH_NAME} | sed -E 's/.*w(eek)?[-_]?([0-9]).*/week\2/gi') + echo Week: ${WEEK} + npm run test-${WEEK} From 62095c1b2e6ec3f27cb8530ca7951de63b2cb8b8 Mon Sep 17 00:00:00 2001 From: Wilgert Velinga Date: Sat, 1 Feb 2020 16:25:25 +0100 Subject: [PATCH 17/24] rename job from build to check --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 7caf4caf9..5fbf4c336 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -3,7 +3,7 @@ name: CheckHomework on: [push] jobs: - build: + check: runs-on: ubuntu-latest steps: From 20c09d831e1d06c537ff7a778df3f1079cf4482a Mon Sep 17 00:00:00 2001 From: Wilgert Velinga Date: Sat, 1 Feb 2020 16:33:32 +0100 Subject: [PATCH 18/24] only run on HackYourHomework --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 5fbf4c336..17454bccd 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -1,11 +1,11 @@ name: CheckHomework -on: [push] +on: [pull_request] jobs: check: + if: contains(github.base_ref,'HackYourHomework') runs-on: ubuntu-latest - steps: - uses: actions/checkout@v2 - uses: nelonoel/branch-name@v1 From a6b3709b67df5fee7dfafb788923a3e5e1b077fe Mon Sep 17 00:00:00 2001 From: Wilgert Velinga Date: Sat, 1 Feb 2020 16:34:34 +0100 Subject: [PATCH 19/24] only run on HackYourFuture --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 17454bccd..157523ad9 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -4,7 +4,7 @@ on: [pull_request] jobs: check: - if: contains(github.base_ref,'HackYourHomework') + if: contains(github.base_ref,'HackYourFuture') runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 From e0a62e0f8a5e83cafab14bd0a3b6b7655424f72f Mon Sep 17 00:00:00 2001 From: Wilgert Velinga Date: Sat, 1 Feb 2020 16:36:25 +0100 Subject: [PATCH 20/24] echo github.base_ref --- .github/workflows/main.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 157523ad9..69977c83a 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -4,7 +4,7 @@ on: [pull_request] jobs: check: - if: contains(github.base_ref,'HackYourFuture') + # if: contains(github.base_ref,'HackYourFuture') runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 @@ -15,6 +15,7 @@ jobs: - run: npm install - name: Echo week folder and run tests run: | + echo ${{github.base_ref}} export WEEK=$(echo ${BRANCH_NAME} | sed -E 's/.*w(eek)?[-_]?([0-9]).*/week\2/gi') echo Week: ${WEEK} npm run test-${WEEK} From 67cf5cf9be63822d7f064dbf82a5e8f1440b1a83 Mon Sep 17 00:00:00 2001 From: Wilgert Velinga Date: Sat, 1 Feb 2020 16:38:49 +0100 Subject: [PATCH 21/24] more echoing --- .github/workflows/main.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 69977c83a..97548e022 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -15,7 +15,8 @@ jobs: - run: npm install - name: Echo week folder and run tests run: | - echo ${{github.base_ref}} - export WEEK=$(echo ${BRANCH_NAME} | sed -E 's/.*w(eek)?[-_]?([0-9]).*/week\2/gi') + echo ${{github.repository}} + echo ${{github.ref}} + export WEEK=$(echo ${{github.ref}} | sed -E 's/.*w(eek)?[-_]?([0-9]).*/week\2/gi') echo Week: ${WEEK} npm run test-${WEEK} From e831675fecc5c3a3210a8627004f80d0c5e6f0b9 Mon Sep 17 00:00:00 2001 From: Wilgert Velinga Date: Sat, 1 Feb 2020 16:40:22 +0100 Subject: [PATCH 22/24] use github.repository for condition --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 97548e022..38aaf5c69 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -4,7 +4,7 @@ on: [pull_request] jobs: check: - # if: contains(github.base_ref,'HackYourFuture') + if: contains(github.repository,'HackYourFuture') runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 From 3b0dde082b99f372b45d777bd11291230cebe128 Mon Sep 17 00:00:00 2001 From: Wilgert Velinga Date: Sat, 1 Feb 2020 16:44:43 +0100 Subject: [PATCH 23/24] use head_ref --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 38aaf5c69..f77c6a02d 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -16,7 +16,7 @@ jobs: - name: Echo week folder and run tests run: | echo ${{github.repository}} - echo ${{github.ref}} - export WEEK=$(echo ${{github.ref}} | sed -E 's/.*w(eek)?[-_]?([0-9]).*/week\2/gi') + echo ${{github.head_ref}} + export WEEK=$(echo ${{github.head_ref}} | sed -E 's/.*w(eek)?[-_]?([0-9]).*/week\2/gi') echo Week: ${WEEK} npm run test-${WEEK} From 0b0b3f14892e43da20c6f127aa35bbedbc755a7e Mon Sep 17 00:00:00 2001 From: Wilgert Velinga Date: Sun, 2 Feb 2020 10:04:07 +0100 Subject: [PATCH 24/24] add quotes and declare variable separately --- .github/workflows/main.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f77c6a02d..6726550b2 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -17,6 +17,7 @@ jobs: run: | echo ${{github.repository}} echo ${{github.head_ref}} - export WEEK=$(echo ${{github.head_ref}} | sed -E 's/.*w(eek)?[-_]?([0-9]).*/week\2/gi') - echo Week: ${WEEK} - npm run test-${WEEK} + declare WEEK + WEEK=$(echo "${{github.head_ref}}" | sed -E 's/.*w(eek)?[-_]?([0-9]).*/week\2/gi') + echo Week: "${WEEK}" + npm run test-"${WEEK}"