From 194c89585488c0ef3998b14b01c1b48cf68b8363 Mon Sep 17 00:00:00 2001 From: Tycho Bokdam Date: Tue, 5 Apr 2022 15:04:50 +0200 Subject: [PATCH 1/3] ci: Also run tests on pr's to release branches --- .github/workflows/test.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index eddf199..907362a 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -3,6 +3,7 @@ on: pull_request: branches: - master + - releases/* jobs: test-json: From 93ff404f75d22201c13923a601b68a807616cbbc Mon Sep 17 00:00:00 2001 From: Tycho Bokdam Date: Tue, 5 Apr 2022 15:13:44 +0200 Subject: [PATCH 2/3] ci: Updated test workflow --- .github/workflows/test.yml | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 907362a..45c65ad 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -16,7 +16,7 @@ jobs: - run: npm ci --prod - - run: touch ./fake-file.log + - run: echo "test" > ./fake-file.log - run: "git config --global user.email 'changelog@github.com'" - run: "git config --global user.name 'Awesome Github action'" - run: "git add . && git commit -m 'feat: Added fake file so version will be bumped'" @@ -51,7 +51,7 @@ jobs: - run: npm ci --prod - - run: touch ./fake-file.log + - run: echo "test" > ./fake-file.log - run: "git config --global user.email 'changelog@github.com'" - run: "git config --global user.name 'Awesome Github action'" - run: "git add . && git commit -m 'feat: Added fake file so version will be bumped'" @@ -86,7 +86,7 @@ jobs: - run: npm ci --prod - - run: touch ./fake-file.log + - run: echo "test" > ./fake-file.log - run: "git config --global user.email 'changelog@github.com'" - run: "git config --global user.name 'Awesome Github action'" - run: "git add . && git commit -m 'feat: Added fake file so version will be bumped'" @@ -181,7 +181,7 @@ jobs: - run: npm ci --prod - - run: touch ./fake-file.log + - run: echo "test" > ./fake-file.log - run: "git config --global user.email 'changelog@github.com'" - run: "git config --global user.name 'Awesome Github action'" - run: "git add . && git commit -m 'feat: Added fake file so version will be bumped'" @@ -240,7 +240,7 @@ jobs: - run: npm ci --prod - - run: touch ./fake-file.log + - run: echo "test" > ./fake-file.log - run: "git config --global user.email 'changelog@github.com'" - run: "git config --global user.name 'Awesome Github action'" - run: "git add . && git commit -m 'feat: Added fake file so version will be bumped'" @@ -311,7 +311,7 @@ jobs: - run: npm ci --prod - - run: touch ./fake-file.log + - run: echo "test" > ./fake-file.log - run: "git config --global user.email 'changelog@github.com'" - run: "git config --global user.name 'Awesome Github action'" - run: "git add . && git commit -m 'feat: Added fake file so version will be bumped'" @@ -350,7 +350,7 @@ jobs: - run: npm ci --prod - - run: touch ./fake-file.log + - run: echo "test" > ./fake-file.log - run: "git config --global user.email 'changelog@github.com'" - run: "git config --global user.name 'Awesome Github action'" - run: "git add . && git commit -m 'feat: Added fake file so version will be bumped'" @@ -387,7 +387,7 @@ jobs: - run: npm ci --prod - - run: touch ./fake-file.log + - run: echo "test" > ./fake-file.log - run: "git config --global user.email 'changelog@github.com'" - run: "git config --global user.name 'Awesome Github action'" - run: "git add . && git commit -m 'feat: Added fake file so version will be bumped'" @@ -424,7 +424,7 @@ jobs: - run: npm ci --prod - - run: touch ./fake-file.log + - run: echo "test" > ./fake-file.log - run: "git config --global user.email 'changelog@github.com'" - run: "git config --global user.name 'Awesome Github action'" - run: "git add . && git commit -m 'feat: Added fake file so version will be bumped'" @@ -461,7 +461,7 @@ jobs: - run: npm ci --prod - - run: touch ./fake-file.log + - run: echo "test" > ./fake-file.log - run: "git config --global user.email 'changelog@github.com'" - run: "git config --global user.name 'Awesome Github action'" - run: "git add . && git commit -m 'feat: Added fake file so version will be bumped'" @@ -501,7 +501,7 @@ jobs: - run: npm ci --prod - - run: touch ./fake-file.log + - run: echo "test" > ./fake-file.log - run: "git config --global user.email 'changelog@github.com'" - run: "git config --global user.name 'Awesome Github action'" - run: "git add . && git commit -m 'feat: Added fake file so version will be bumped'" @@ -534,7 +534,7 @@ jobs: - run: npm ci --prod - - run: touch ./fake-file.log + - run: echo "test" > ./fake-file.log - run: "git config --global user.email 'changelog@github.com'" - run: "git config --global user.name 'Awesome Github action'" - run: "git add . && git commit -m 'feat: Added fake file so version will be bumped'" @@ -569,7 +569,7 @@ jobs: - run: npm ci --prod - - run: touch ./fake-file.log + - run: echo "test" > ./fake-file.log - run: "git config --global user.email 'changelog@github.com'" - run: "git config --global user.name 'Awesome Github action'" - run: "git add . && git commit -m 'feat: Added fake file so version will be bumped'" @@ -611,7 +611,7 @@ jobs: - run: npm ci --prod - - run: touch ./fake-file.log + - run: echo "test" > ./fake-file.log - run: "git config --global user.email 'changelog@github.com'" - run: "git config --global user.name 'Awesome Github action'" - run: "git add . && git commit -m 'feat: Added fake file so version will be bumped'" From b74fc264fafc009b3d5d78591b886e1ee5bf593b Mon Sep 17 00:00:00 2001 From: Tycho Bokdam Date: Tue, 5 Apr 2022 15:16:58 +0200 Subject: [PATCH 3/3] ci: Updated test workflow --- .github/workflows/test.yml | 48 ++++++++++++++------------------------ 1 file changed, 17 insertions(+), 31 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 45c65ad..2d3d746 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -16,10 +16,9 @@ jobs: - run: npm ci --prod - - run: echo "test" > ./fake-file.log - run: "git config --global user.email 'changelog@github.com'" - run: "git config --global user.name 'Awesome Github action'" - - run: "git add . && git commit -m 'feat: Added fake file so version will be bumped'" + - run: "git add . && git commit --allow-empty -m 'feat: Added fake file so version will be bumped'" - name: Generate changelog id: changelog @@ -51,10 +50,9 @@ jobs: - run: npm ci --prod - - run: echo "test" > ./fake-file.log - run: "git config --global user.email 'changelog@github.com'" - run: "git config --global user.name 'Awesome Github action'" - - run: "git add . && git commit -m 'feat: Added fake file so version will be bumped'" + - run: "git add . && git commit --allow-empty -m 'feat: Added fake file so version will be bumped'" - name: Generate changelog id: changelog @@ -86,10 +84,9 @@ jobs: - run: npm ci --prod - - run: echo "test" > ./fake-file.log - run: "git config --global user.email 'changelog@github.com'" - run: "git config --global user.name 'Awesome Github action'" - - run: "git add . && git commit -m 'feat: Added fake file so version will be bumped'" + - run: "git add . && git commit --allow-empty -m 'feat: Added fake file so version will be bumped'" - run: touch ./test-file-empty.json @@ -127,7 +124,7 @@ jobs: - run: git tag | xargs git tag -d - name: Create fake tag run: "git tag -a 'v0.55.8' -m 'v0.55.8'" - - run: "git add . && git commit -m 'fix: Added fake file so version will be bumped'" + - run: "git add . && git commit --allow-empty -m 'fix: Added fake file so version will be bumped'" - name: Generate changelog id: changelog @@ -156,7 +153,7 @@ jobs: - run: git tag | xargs git tag -d - name: Create fake tag run: "git tag -a 'v0.55.8' -m 'v0.55.8'" - - run: "git add . && git commit -m 'fix: Added fake file so version will be bumped'" + - run: "git add . && git commit --allow-empty -m 'fix: Added fake file so version will be bumped'" - name: Generate changelog id: changelog @@ -181,10 +178,9 @@ jobs: - run: npm ci --prod - - run: echo "test" > ./fake-file.log - run: "git config --global user.email 'changelog@github.com'" - run: "git config --global user.name 'Awesome Github action'" - - run: "git add . && git commit -m 'feat: Added fake file so version will be bumped'" + - run: "git add . && git commit --allow-empty -m 'feat: Added fake file so version will be bumped'" - run: git tag | xargs git tag -d @@ -215,7 +211,7 @@ jobs: - run: git tag | xargs git tag -d - name: Create fake tag run: "git tag -a 'v0.55.8' -m 'v0.55.8'" - - run: "git add . && git commit -m 'fix: Added fake file so version will be bumped'" + - run: "git add . && git commit --allow-empty -m 'fix: Added fake file so version will be bumped'" - name: Generate changelog id: changelog @@ -240,10 +236,9 @@ jobs: - run: npm ci --prod - - run: echo "test" > ./fake-file.log - run: "git config --global user.email 'changelog@github.com'" - run: "git config --global user.name 'Awesome Github action'" - - run: "git add . && git commit -m 'feat: Added fake file so version will be bumped'" + - run: "git add . && git commit --allow-empty -m 'feat: Added fake file so version will be bumped'" - name: Generate changelog id: changelog @@ -311,10 +306,9 @@ jobs: - run: npm ci --prod - - run: echo "test" > ./fake-file.log - run: "git config --global user.email 'changelog@github.com'" - run: "git config --global user.name 'Awesome Github action'" - - run: "git add . && git commit -m 'feat: Added fake file so version will be bumped'" + - run: "git add . && git commit --allow-empty -m 'feat: Added fake file so version will be bumped'" - run: touch ./test-file-empty.yaml @@ -350,10 +344,9 @@ jobs: - run: npm ci --prod - - run: echo "test" > ./fake-file.log - run: "git config --global user.email 'changelog@github.com'" - run: "git config --global user.name 'Awesome Github action'" - - run: "git add . && git commit -m 'feat: Added fake file so version will be bumped'" + - run: "git add . && git commit --allow-empty -m 'feat: Added fake file so version will be bumped'" - name: Generate changelog id: changelog @@ -387,10 +380,9 @@ jobs: - run: npm ci --prod - - run: echo "test" > ./fake-file.log - run: "git config --global user.email 'changelog@github.com'" - run: "git config --global user.name 'Awesome Github action'" - - run: "git add . && git commit -m 'feat: Added fake file so version will be bumped'" + - run: "git add . && git commit --allow-empty -m 'feat: Added fake file so version will be bumped'" - name: Generate changelog id: changelog @@ -424,10 +416,9 @@ jobs: - run: npm ci --prod - - run: echo "test" > ./fake-file.log - run: "git config --global user.email 'changelog@github.com'" - run: "git config --global user.name 'Awesome Github action'" - - run: "git add . && git commit -m 'feat: Added fake file so version will be bumped'" + - run: "git add . && git commit --allow-empty -m 'feat: Added fake file so version will be bumped'" - name: Generate changelog id: changelog @@ -461,10 +452,9 @@ jobs: - run: npm ci --prod - - run: echo "test" > ./fake-file.log - run: "git config --global user.email 'changelog@github.com'" - run: "git config --global user.name 'Awesome Github action'" - - run: "git add . && git commit -m 'feat: Added fake file so version will be bumped'" + - run: "git add . && git commit --allow-empty -m 'feat: Added fake file so version will be bumped'" - run: touch ./test-file-empty.toml @@ -501,10 +491,9 @@ jobs: - run: npm ci --prod - - run: echo "test" > ./fake-file.log - run: "git config --global user.email 'changelog@github.com'" - run: "git config --global user.name 'Awesome Github action'" - - run: "git add . && git commit -m 'feat: Added fake file so version will be bumped'" + - run: "git add . && git commit --allow-empty -m 'feat: Added fake file so version will be bumped'" - run: test -f pre-commit.test.json && (echo should not be here yet && exit 1) || exit 0 @@ -534,10 +523,9 @@ jobs: - run: npm ci --prod - - run: echo "test" > ./fake-file.log - run: "git config --global user.email 'changelog@github.com'" - run: "git config --global user.name 'Awesome Github action'" - - run: "git add . && git commit -m 'feat: Added fake file so version will be bumped'" + - run: "git add . && git commit --allow-empty -m 'feat: Added fake file so version will be bumped'" - run: test -f pre-changelog-generation.test.json && (echo should not be here yet && exit 1) || exit 0 @@ -569,10 +557,9 @@ jobs: - run: npm ci --prod - - run: echo "test" > ./fake-file.log - run: "git config --global user.email 'changelog@github.com'" - run: "git config --global user.name 'Awesome Github action'" - - run: "git add . && git commit -m 'feat: Added fake file so version will be bumped'" + - run: "git add . && git commit --allow-empty -m 'feat: Added fake file so version will be bumped'" - name: Generate changelog id: changelog @@ -611,10 +598,9 @@ jobs: - run: npm ci --prod - - run: echo "test" > ./fake-file.log - run: "git config --global user.email 'changelog@github.com'" - run: "git config --global user.name 'Awesome Github action'" - - run: "git add . && git commit -m 'feat: Added fake file so version will be bumped'" + - run: "git add . && git commit --allow-empty -m 'feat: Added fake file so version will be bumped'" - name: Generate Changelog id: changelog