@fishawack/lab-env 4.35.0 → 4.35.2

package/.gitmodules

@@ -0,0 +1,3 @@
+[submodule "core/1"]
+	path = core/1
+	url = git@bitbucket.org:fishawackdigital/lab-env-core-1

package/CHANGELOG.md

@@ -1,5 +1,25 @@
 ## Changelog
 
+### 4.35.2 (2024-10-02)
+
+#### Build Updates
+
+* install submodules during release so avail in npm module ([94f14a5](https://bitbucket.org/fishawackdigital/lab-env/commits/94f14a5849d7ad9027503865dd8d4395c25f077f))
+
+### 4.35.1 (2024-10-02)
+
+#### Build Updates
+
+* added setup script that inits submodules ([cdb1415](https://bitbucket.org/fishawackdigital/lab-env/commits/cdb14156ae73ef188d804ce84a5900f74d964e55))
+* Bumped lab-env-core-1 ([9fbdae6](https://bitbucket.org/fishawackdigital/lab-env/commits/9fbdae666f9c70ca82ca891c1027413415b8caac))
+* commit and open pull request against aws-runner on publish" ([174cb20](https://bitbucket.org/fishawackdigital/lab-env/commits/174cb2031dac53121e11c237cd3ddf54d93b6744))
+* escape quote in include check ([658f4ba](https://bitbucket.org/fishawackdigital/lab-env/commits/658f4ba6dadd217ce07486f1165a2a312892f7df))
+* exit early if semantic release doesnt publish anything ([99c7b9f](https://bitbucket.org/fishawackdigital/lab-env/commits/99c7b9fb13b55713fb4f522e08d98c778376fc9b))
+* installed core/1 as a submodule ([f40ad71](https://bitbucket.org/fishawackdigital/lab-env/commits/f40ad711acab83c29b30c3817c0731a956f44abb))
+* publish on more commit types ([4b8ac27](https://bitbucket.org/fishawackdigital/lab-env/commits/4b8ac2725d1a218c516682ec727ce869ddde1237))
+* remove core/1 from repo ([35e96ce](https://bitbucket.org/fishawackdigital/lab-env/commits/35e96ce7ea4723cdf5b144ce28f219b0ce4ca040))
+* use setup script instead of ci directly ([4e2464c](https://bitbucket.org/fishawackdigital/lab-env/commits/4e2464c6d0fd545a2fe4d91821ff56715a6816d6))
+
 ### 4.35.0 (2024-09-26)
 
 #### Features

package/bitbucket-pipelines.yml

@@ -39,7 +39,7 @@ pipelines:
           # Own the .tmp folder as aws-runner so that a non-root user id can be mapped to each container
           - chown -R aws-runner:aws-runner /tmp
           # Install
-          - su aws-runner -c 'npm ci'
+          - su aws-runner -c 'npm run setup'
           # Test
           - su aws-runner -c 'npm test'
         services:
@@ -54,9 +54,46 @@ pipelines:
             - production
           size: 4x
           script:
+            # Install lib deps
+            - git submodule init && git submodule update
             # Install release deps
             - npm install -g semantic-release@24 @semantic-release/changelog@6 @semantic-release/git@10 conventional-changelog-conventionalcommits@8
-            # Release version
-            - semantic-release --repositoryUrl=https://$GIT_CREDENTIALS@bitbucket.org/$BITBUCKET_REPO_FULL_NAME
+            # Release version via node so can exit out when no release made
+            - |
+              node -e "const spawn = require('child_process').spawn('semantic-release', ['--repositoryUrl', 'https://$GIT_CREDENTIALS@bitbucket.org/$BITBUCKET_REPO_FULL_NAME'], { env: { ...process.env, FORCE_COLOR: true } }); spawn.stderr.on('data', d => process.stderr.write(d.toString())); spawn.stdout.on('data', d => {process.stdout.write(d.toString()); if(d.toString().includes('There are no relevant changes, so no new version is released.') || d.toString().includes('therefore a new version won\'t be published.')){process.exit(1);}})" || exit 0
             # Sync development after publish
-            - git fetch origin "+refs/heads/*:refs/remotes/origin/*" && git checkout -b development origin/development && git merge master && git push origin development
+            - git fetch origin "+refs/heads/*:refs/remotes/origin/*" && git checkout -b development origin/development && git merge master && git push origin development
+            # Commit and create pull request for new version on aws-runner repo
+            - git config --global user.email "digital@fishawack.com"
+            - git config --global user.name "Digital Fishawack"
+            - git clone https://$GIT_CREDENTIALS@bitbucket.org/fishawackdigital/aws-runner
+            - cd aws-runner
+            - git checkout -b "$BITBUCKET_REPO_SLUG-$BITBUCKET_COMMIT" origin/development
+            - sed -i -e "s/\(@fishawack\/lab-env@\).*/\1$(git ls-remote --tags --refs --sort="v:refname" https://$GIT_CREDENTIALS@bitbucket.org/$BITBUCKET_REPO_FULL_NAME | tail -n1 | sed 's/.*\///')/g" Dockerfile
+            - git add .
+            - |
+              git commit --allow-empty -m "build: Bumped $BITBUCKET_REPO_SLUG"
+            - git push origin "$BITBUCKET_REPO_SLUG-$BITBUCKET_COMMIT"
+            - |
+              curl https://api.bitbucket.org/2.0/repositories/fishawackdigital/aws-runner/pullrequests \
+                -u $GIT_CREDENTIALS \
+                --header 'Content-Type: application/json' \
+                --data "{
+                  \"title\": \"Bumped $BITBUCKET_REPO_SLUG\",
+                  \"destination\": {
+                    \"branch\": {
+                      \"name\": \"development\"
+                    }
+                  },
+                  \"source\": {
+                    \"branch\": {
+                      \"name\": \"$BITBUCKET_REPO_SLUG-$BITBUCKET_COMMIT\"
+                    }
+                  },
+                  \"reviewers\": [
+                      {
+                          \"uuid\": \"{2518e4c3-fc1d-4653-b355-c00be099ce6c}\"
+                      }
+                  ],
+                  \"close_source_branch\": true
+                }"

package/core/1/CHANGELOG.md

@@ -1,5 +1,21 @@
 ## Changelog
 
+### 1.5.0 (2024-10-01)
+
+#### Features
+
+* commit into lab-env and create pull request against development on publish ([22e9c66](https://bitbucket.org/fishawackdigital/lab-env-core-1/commits/22e9c666dff1e6453090da472a6cd4f0b89c6fbb))
+
+#### Bug Fixes
+
+* close source branch by default on pull request ([5208373](https://bitbucket.org/fishawackdigital/lab-env-core-1/commits/5208373822272c648a547f9b328720cb4fdf9bd4))
+
+### 1.4.2 (2024-10-01)
+
+#### Bug Fixes
+
+* trigger ci ([301d679](https://bitbucket.org/fishawackdigital/lab-env-core-1/commits/301d6795162f0bf8941a3b9413a30092a3e8bf21))
+
 ### 1.4.1 (2024-07-17)
 * [fix] set global var for git across file system so git avail in mounted volumes i.e node_modules
 
@@ -49,4 +65,4 @@
 * [Fix] lftp installed in alpine image as it's needed for content tasks
 
 ### 1.0.0 (2023-02-21)
-* [Misc] initial commit
+* [Misc] initial commit

package/core/1/README.md

@@ -0,0 +1,9 @@
+## Background
+
+### What
+
+The image used for core@8 and above.
+
+### Why
+
+Allows us to automate the local developer & CI environments.

package/core/1/bitbucket-pipelines.yml

@@ -0,0 +1,62 @@
+definitions:
+  services:
+    docker:
+      image: docker:dind
+      memory: 12288
+
+pipelines:
+  branches:
+    master:
+      - step:
+          image: fishawack/aws-runner
+          runs-on:
+            - self.hosted
+            - linux
+            - production
+          size: 4x
+          script:
+            # Copy ssh keys so physical files exist for agent to use
+            - cp /build/*/ssh/* ~/.ssh/
+            # Start ssh agent and add all (if any) keys
+            - eval `ssh-agent` && ssh-add || true
+            # Install release deps
+            - npm install -g semantic-release@24 @semantic-release/changelog@6 @semantic-release/git@10 conventional-changelog-conventionalcommits@8
+            # Release version
+            - semantic-release --repositoryUrl=https://$GIT_CREDENTIALS@bitbucket.org/$BITBUCKET_REPO_FULL_NAME
+            # Publish docker image
+            - docker login $DOCKER_CREDENTIALS && docker buildx create --use && npm run image
+            # Sync development after publish
+            - git fetch origin "+refs/heads/*:refs/remotes/origin/*" && git checkout -b development origin/development && git merge master && git push origin development
+            # Commit and create pull request for new version on lab-env repo
+            - git config --global user.email "digital@fishawack.com"
+            - git config --global user.name "Digital Fishawack"
+            - git clone https://$GIT_CREDENTIALS@bitbucket.org/fishawackdigital/lab-env
+            - cd lab-env
+            - git checkout -b "$BITBUCKET_REPO_SLUG-$BITBUCKET_COMMIT" origin/development
+            - git submodule init
+            - git submodule update
+            - git submodule update --remote --merge core/1
+            - git add .
+            - |
+              git commit --allow-empty -m "build: Bumped $BITBUCKET_REPO_SLUG"
+            - git push origin "$BITBUCKET_REPO_SLUG-$BITBUCKET_COMMIT"
+            - |
+              curl https://api.bitbucket.org/2.0/repositories/fishawackdigital/lab-env/pullrequests \
+                -u $GIT_CREDENTIALS \
+                --header 'Content-Type: application/json' \
+                --data "{
+                  \"title\": \"Bumped $BITBUCKET_REPO_SLUG\",
+                  \"destination\": {
+                    \"branch\": {
+                      \"name\": \"development\"
+                    }
+                  },
+                  \"source\": {
+                    \"branch\": {
+                      \"name\": \"$BITBUCKET_REPO_SLUG-$BITBUCKET_COMMIT\"
+                    }
+                  },
+                  \"close_source_branch\": true
+                }"
+          services:
+            - docker

package/core/1/package.json

@@ -1,11 +1,46 @@
 {
   "name": "core",
-  "version": "1.4.1",
+  "version": "1.5.0",
   "description": "lab-env docker config for the @fishawack/core/1 npm module",
   "scripts": {
-    "preversion": "docker login",
-    "postversion": "docker buildx build --ssh default --platform linux/amd64,linux/arm64 -t fishawack/lab-env-core-1:$npm_package_version -t fishawack/lab-env-core-1:latest --push . && docker buildx build --ssh default --target alpine --platform linux/amd64,linux/arm64 -t fishawack/lab-env-core-1-alpine:$npm_package_version -t fishawack/lab-env-core-1-alpine:latest --push . && git add . && git commit -m \"build: Bumped fishawack/lab-env-core-1 to $npm_package_version\""
+    "image": "docker buildx build --ssh default --platform linux/amd64,linux/arm64 -t fishawack/lab-env-core-1:$npm_package_version -t fishawack/lab-env-core-1:latest --push . && docker buildx build --ssh default --target alpine --platform linux/amd64,linux/arm64 -t fishawack/lab-env-core-1-alpine:$npm_package_version -t fishawack/lab-env-core-1-alpine:latest --push ."
   },
   "author": "Mike Mellor",
-  "license": "ISC"
+  "license": "ISC",
+  "release": {
+    "plugins": [
+      [
+        "@semantic-release/commit-analyzer",
+        {
+          "preset": "conventionalcommits"
+        }
+      ],
+      [
+        "@semantic-release/release-notes-generator",
+        {
+          "preset": "conventionalcommits",
+          "writerOpts": {
+            "headerPartial": "### {{version}} ({{date}})\n",
+            "mainTemplate": "{{> header}}\n{{#each commitGroups}}\n\n{{#if title}}\n#### {{title}}\n\n{{/if}}\n{{#each commits}}\n{{> commit root=@root}}\n{{/each}}\n{{/each}}"
+          },
+          "presetConfig": {
+            "commitUrlFormat": "{{host}}/{{owner}}/{{repository}}/commits/{{hash}}"
+          }
+        }
+      ],
+      [
+        "@semantic-release/changelog",
+        {
+          "changelogTitle": "## Changelog"
+        }
+      ],
+      [
+        "@semantic-release/npm",
+        {
+          "npmPublish": false
+        }
+      ],
+      "@semantic-release/git"
+    ]
+  }
 }

package/package.json

@@ -1,9 +1,10 @@
 {
   "name": "@fishawack/lab-env",
-  "version": "4.35.0",
+  "version": "4.35.2",
   "description": "Docker manager for FW",
   "main": "cli.js",
   "scripts": {
+    "setup": "npm ci && git submodule init && git submodule update",
     "test": "rm -rf _Test/_fixtures/boilerplate*; CI_BUILD_ID=true mocha _Test/*.js --timeout 12000s --bail"
   },
   "repository": {
@@ -54,7 +55,29 @@
       [
         "@semantic-release/commit-analyzer",
         {
-          "preset": "conventionalcommits"
+          "preset": "conventionalcommits",
+          "releaseRules": [
+            {
+              "type": "build",
+              "release": "patch"
+            },
+            {
+              "type": "perf",
+              "release": "patch"
+            },
+            {
+              "type": "ci",
+              "release": "patch"
+            },
+            {
+              "type": "refactor",
+              "release": "patch"
+            },
+            {
+              "type": "style",
+              "release": "patch"
+            }
+          ]
         }
       ],
       [
@@ -66,7 +89,37 @@
             "mainTemplate": "{{> header}}\n{{#each commitGroups}}\n\n{{#if title}}\n#### {{title}}\n\n{{/if}}\n{{#each commits}}\n{{> commit root=@root}}\n{{/each}}\n{{/each}}"
           },
           "presetConfig": {
-            "commitUrlFormat": "{{host}}/{{owner}}/{{repository}}/commits/{{hash}}"
+            "commitUrlFormat": "{{host}}/{{owner}}/{{repository}}/commits/{{hash}}",
+            "types": [
+              {
+                "type": "feat",
+                "section": "Features"
+              },
+              {
+                "type": "fix",
+                "section": "Bug Fixes"
+              },
+              {
+                "type": "build",
+                "section": "Build Updates"
+              },
+              {
+                "type": "perf",
+                "section": "Performance Improvements"
+              },
+              {
+                "type": "ci",
+                "section": "CI/CD updates"
+              },
+              {
+                "type": "refactor",
+                "section": "Code Refactors"
+              },
+              {
+                "type": "style",
+                "section": "Style Updates"
+              }
+            ]
           }
         }
       ],