Merge pull request #9 from Nerdware-LLC/next

Next

.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 }}

.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 }}

.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

.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

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

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",
@@ -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": {