From 2332247a5321267ce5483f629c3d90184797b7b1 Mon Sep 17 00:00:00 2001 From: trevor-anderson Date: Sun, 9 Jul 2023 11:23:09 -0400 Subject: [PATCH 1/5] feat(ci): ensure codegen'd files are ignore by pre-commit hooks --- .pre-commit-config.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 9ef150fa..7ed89803 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -14,7 +14,9 @@ repos: - id: check-executables-have-shebangs - id: check-yaml # validate yaml file syntax - id: end-of-file-fixer # ensure files end in newline char + exclude: src/types/graphql # don't modify codegen'd content - id: trailing-whitespace # trim superfluous whitespace from eol + exclude: src/types/graphql # don't modify codegen'd content args: [--markdown-linebreak-ext=md] # Security From 3918e94c2ff86b0ad029c5465cf2e44606c92c57 Mon Sep 17 00:00:00 2001 From: trevor-anderson Date: Sun, 9 Jul 2023 11:23:47 -0400 Subject: [PATCH 2/5] feat(ci): rm PR from events triggering Release Workflow --- .github/workflows/release.yaml | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 8021b0eb..04ba7b0f 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -5,20 +5,13 @@ on: workflow_call: # may be called by the Test workflow secrets: SEMANTIC_RELEASE_TOKEN: { required: true } - pull_request: - types: [closed] - branches: [main, next] - paths: ["src/**/*", "package*.json"] push: branches: [main, next] paths: ["src/**/*", "package*.json"] jobs: release: - name: Release # if event is a closed PR, only run if PR was merged - if: | - github.event_name != 'pull_request' || - github.event.pull_request.merged == true + name: Release uses: Nerdware-LLC/reusable-action-workflows/.github/workflows/release.yaml@main secrets: SEMANTIC_RELEASE_TOKEN: ${{ secrets.SEMANTIC_RELEASE_TOKEN }} From d2c102cdf258587aeb2629f4589e2a5b24e5f705 Mon Sep 17 00:00:00 2001 From: trevor-anderson Date: Sun, 9 Jul 2023 11:47:12 -0400 Subject: [PATCH 3/5] feat(ci): set engines.node to '>=16.0.0', set explicit node-version in Test Workflow --- .github/workflows/test.yaml | 1 + package.json | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 0d30dbc6..ee3f6cf4 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -15,6 +15,7 @@ jobs: name: Run Tests uses: Nerdware-LLC/reusable-action-workflows/.github/workflows/node_test.yaml@main with: + node-version: "16.17.0" test-script: "test" # The node_test workflow masks these "env-vars" values and makes them # available as environment variables for the test script. This serves as diff --git a/package.json b/package.json index 7b93bd86..09c713c9 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,7 @@ "url": "https://github.com/Nerdware-LLC/fixit-api/issues" }, "engines": { - "node": "16.17.0" + "node": ">=16.0.0" }, "type": "module", "scripts": { From f9e0cb89e333b2555143929157604781526bc625 Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Sun, 9 Jul 2023 15:47:45 +0000 Subject: [PATCH 4/5] chore(release): version 1.22.0-next.1 [skip ci] # [1.22.0-next.1](https://github.com/Nerdware-LLC/fixit-api/compare/v1.21.0...v1.22.0-next.1) (2023-07-09) ### Features * **ci:** ensure codegen'd files are ignore by pre-commit hooks ([2332247](https://github.com/Nerdware-LLC/fixit-api/commit/2332247a5321267ce5483f629c3d90184797b7b1)) * **ci:** rm PR from events triggering Release Workflow ([3918e94](https://github.com/Nerdware-LLC/fixit-api/commit/3918e94c2ff86b0ad029c5465cf2e44606c92c57)) * **ci:** set engines.node to '>=16.0.0', set explicit node-version in Test Workflow ([d2c102c](https://github.com/Nerdware-LLC/fixit-api/commit/d2c102cdf258587aeb2629f4589e2a5b24e5f705)) --- CHANGELOG.md | 9 +++++++++ package-lock.json | 4 ++-- package.json | 2 +- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ffee7102..193873aa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,15 @@ All notable changes to this project will be documented in this file. --- +# [1.22.0-next.1](https://github.com/Nerdware-LLC/fixit-api/compare/v1.21.0...v1.22.0-next.1) (2023-07-09) + + +### Features + +* **ci:** ensure codegen'd files are ignore by pre-commit hooks ([2332247](https://github.com/Nerdware-LLC/fixit-api/commit/2332247a5321267ce5483f629c3d90184797b7b1)) +* **ci:** rm PR from events triggering Release Workflow ([3918e94](https://github.com/Nerdware-LLC/fixit-api/commit/3918e94c2ff86b0ad029c5465cf2e44606c92c57)) +* **ci:** set engines.node to '>=16.0.0', set explicit node-version in Test Workflow ([d2c102c](https://github.com/Nerdware-LLC/fixit-api/commit/d2c102cdf258587aeb2629f4589e2a5b24e5f705)) + # [1.21.0](https://github.com/Nerdware-LLC/fixit-api/compare/v1.20.0...v1.21.0) (2023-07-08) ### Features diff --git a/package-lock.json b/package-lock.json index 3c0e884e..e2f10138 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "fixit-api", - "version": "1.21.0", + "version": "1.22.0-next.1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "fixit-api", - "version": "1.21.0", + "version": "1.22.0-next.1", "license": "LicenseRef-LICENSE", "dependencies": { "@apollo/server": "^4.7.5", diff --git a/package.json b/package.json index 09c713c9..55e52cdf 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fixit-api", - "version": "1.21.0", + "version": "1.22.0-next.1", "description": "Fixit API services built on NodeJS and Apollo GraphQL.", "author": { "name": "Trevor Anderson", From c94a508a1bbc63bb7ec464c1d27273273870d694 Mon Sep 17 00:00:00 2001 From: trevor-anderson Date: Sun, 9 Jul 2023 13:30:37 -0400 Subject: [PATCH 5/5] feat(ci): add 'dockerfile-path' input to ecr_image_push --- .github/workflows/deploy.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml index 8edf99e8..f6334751 100644 --- a/.github/workflows/deploy.yaml +++ b/.github/workflows/deploy.yaml @@ -8,6 +8,8 @@ jobs: deploy: name: Deploy uses: Nerdware-LLC/reusable-action-workflows/.github/workflows/ecr_image_push.yaml@main + with: + dockerfile-path: ./docker/Dockerfile secrets: OIDC_GITHUB_ROLE_ARN: ${{ secrets.OIDC_GITHUB_ROLE_ARN }} AWS_ECR_PRIVATE_REPO: ${{ secrets.AWS_ECR_PRIVATE_REPO }}