Skip to content

Commit d2e4049

Browse files
michaelwittwermichaelwittwer
authored
Merge pull request #78 from shiftcode/#77-fix-workflow
ci(main): fix workflow
2 parents 4335319 + 962195f commit d2e4049

File tree

15 files changed

+76
-57
lines changed

15 files changed

+76
-57
lines changed

‎.github/workflows/main.yml‎

Lines changed: 22 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,22 @@ on:
1616
tags-ignore:
1717
- '**'
1818
jobs:
19+
checkExecution:
20+
runs-on: ubuntu-latest
21+
outputs:
22+
shouldExecute: ${{ steps.stepCheckExecution.outputs.shouldExecute }}
23+
steps:
24+
- id: stepCheckExecution
25+
name: Check for execution
26+
uses: shiftcode/github-action-skip@9d4a90c80567f59dfaacf18fe703a324583c742e #v5.0.0
27+
with:
28+
skipOnCommitMsg: '[skip_build]'
29+
githubToken: ${{ secrets.GITHUB_TOKEN }}
1930
test:
2031
runs-on: ubuntu-latest
32+
needs: checkExecution
33+
# only execute if not skipped by commit message
34+
if: needs.checkExecution.outputs.shouldExecute == 'true'
2135
strategy:
2236
matrix:
2337
# Test with Node.js 24 and v25
@@ -31,7 +45,7 @@ jobs:
3145
uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd #v5.0.1
3246
# setup node and dependency cache
3347
- name: Setup Node and NPM Cache
34-
uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
48+
uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 #v5.0.0
3549
with:
3650
node-version: ${{ matrix.node }}
3751
cache: 'npm'
@@ -46,7 +60,9 @@ jobs:
4660
permissions:
4761
contents: write
4862
packages: write
49-
needs: test
63+
needs: [checkExecution, test]
64+
# only execute if not skipped by commit message
65+
if: needs.checkExecution.outputs.shouldExecute == 'true'
5066
steps:
5167
# checkout branch
5268
- name: Checkout
@@ -56,7 +72,7 @@ jobs:
5672
fetch-depth: 0
5773
# setup node and dependency cache
5874
- name: Setup Node and NPM Cache
59-
uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
75+
uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 #v5.0.0
6076
with:
6177
node-version-file: .nvmrc
6278
cache: 'npm'
@@ -84,3 +100,6 @@ jobs:
84100
npm run publish-libs
85101
env:
86102
GITHUB_CONTEXT: ${{ toJson(github) }}
103+
# necessary to commit on protected branch after merging
104+
# and to run actions after version-bump commit (otherwise we can't create rules for merging as no workflows run after GITHUB_TOKEN commits)
105+
GH_TOKEN: ${{ secrets.GH_TOKEN }}

‎package-lock.json‎

Lines changed: 27 additions & 27 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎packages/airtable-mapper/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@shiftcode/airtable-mapper",
3-
"version": "1.0.0-pr254.14",
3+
"version": "1.0.0-pr77.2",
44
"description": "interfaces and classes for airtable mapping",
55
"repository": "https://github.com/shiftcode/sc-commons-public",
66
"license": "MIT",

‎packages/airtable-syncer/package.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@shiftcode/airtable-syncer",
3-
"version": "1.0.0-pr254.14",
3+
"version": "1.0.0-pr77.2",
44
"description": "base utils and services to export airtable and upload to S3",
55
"repository": "https://github.com/shiftcode/sc-commons-public",
66
"license": "MIT",
@@ -28,10 +28,10 @@
2828
"p-queue": "^9.0.1"
2929
},
3030
"devDependencies": {
31-
"@shiftcode/airtable-mapper": "^1.0.0-pr254.14",
32-
"@shiftcode/inversify-logger": "^1.0.0-pr254.14",
33-
"@shiftcode/lambda-utilities": "^1.0.0-pr254.14",
34-
"@shiftcode/logger": "^5.0.0-pr254.17",
31+
"@shiftcode/airtable-mapper": "^1.0.0-pr77.2",
32+
"@shiftcode/inversify-logger": "^1.0.0-pr77.2",
33+
"@shiftcode/lambda-utilities": "^1.0.0-pr77.2",
34+
"@shiftcode/logger": "^5.0.0-pr77.2",
3535
"@swc/core": "^1.15.11",
3636
"unplugin-swc": "^1.5.9"
3737
},

‎packages/branch-utilities/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@shiftcode/branch-utilities",
3-
"version": "6.0.0-pr254.17",
3+
"version": "6.0.0-pr77.2",
44
"description": "Utilities for local and ci to get branch name and stage",
55
"repository": "https://github.com/shiftcode/sc-commons-public",
66
"license": "MIT",

‎packages/cdk-utilities/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@shiftcode/cdk-utilities",
3-
"version": "1.0.0-pr254.14",
3+
"version": "1.0.0-pr77.2",
44
"description": "Constructs for iac with aws-cdk-lib",
55
"repository": "https://github.com/shiftcode/sc-commons-public",
66
"license": "MIT",

‎packages/eslint-config-recommended/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@shiftcode/eslint-config-recommended",
3-
"version": "7.0.0-pr254.17",
3+
"version": "7.0.0-pr77.2",
44
"description": "default shiftcode config for eslint",
55
"repository": "https://github.com/shiftcode/sc-commons-public",
66
"license": "MIT",
@@ -28,7 +28,7 @@
2828
},
2929
"dependencies": {
3030
"@eslint/js": "^9.37.0",
31-
"@shiftcode/eslint-plugin-rules": "^6.0.0-pr254.17",
31+
"@shiftcode/eslint-plugin-rules": "^6.0.0-pr77.2",
3232
"eslint": "^9.37.0",
3333
"eslint-config-prettier": "^10.1.8",
3434
"eslint-plugin-import": "^2.32.0",

‎packages/eslint-plugin-rules/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@shiftcode/eslint-plugin-rules",
3-
"version": "6.0.0-pr254.17",
3+
"version": "6.0.0-pr77.2",
44
"description": "eslint-rules for shiftcode-specific eslint rules",
55
"repository": "https://github.com/shiftcode/sc-commons-public",
66
"license": "MIT",

‎packages/iac-utilities/package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@shiftcode/iac-utilities",
3-
"version": "1.0.0-pr254.14",
3+
"version": "1.0.0-pr77.2",
44
"description": "scripts and util functions for aws iac",
55
"repository": "https://github.com/shiftcode/sc-commons-public",
66
"license": "MIT",
@@ -54,8 +54,8 @@
5454
"@aws-sdk/client-s3": "^3.204.0",
5555
"@aws-sdk/credential-providers": "^3.204.0",
5656
"@aws-sdk/types": "^3.201.0",
57-
"@shiftcode/branch-utilities": "^6.0.0-pr254.17",
58-
"@shiftcode/lambda-utilities": "^1.0.0-pr254.14",
57+
"@shiftcode/branch-utilities": "^6.0.0-pr77.2",
58+
"@shiftcode/lambda-utilities": "^1.0.0-pr77.2",
5959
"@types/yargs": "^17.0.5"
6060
},
6161
"peerDependencies": {

‎packages/inversify-logger/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@shiftcode/inversify-logger",
3-
"version": "1.0.0-pr254.14",
3+
"version": "1.0.0-pr77.2",
44
"description": "InversifyJS support for the logger package",
55
"repository": "https://github.com/shiftcode/sc-commons-public",
66
"license": "MIT",
@@ -28,7 +28,7 @@
2828
"test:watch": "vitest --cache"
2929
},
3030
"devDependencies": {
31-
"@shiftcode/logger": "^5.0.0-pr254.17",
31+
"@shiftcode/logger": "^5.0.0-pr77.2",
3232
"inversify": "^7.0.0",
3333
"reflect-metadata": "^0.2.0"
3434
},

0 commit comments

Comments
 (0)