Skip to content

Sync development with master.#141

Merged
Duslerke merged 19 commits intodevelopmentfrom
master
Feb 26, 2026
Merged

Sync development with master.#141
Duslerke merged 19 commits intodevelopmentfrom
master

Conversation

@Duslerke
Copy link
Contributor

What:

  • Sync development with master branch.

Duslerke and others added 19 commits October 15, 2024 11:15
Merge of PR #132 from `develop` to `master`.

Co-authored-by: Miles Alford <43789512+Miles-Alford@users.noreply.github.com>
A merge of PR #134 from `development` to `master`.

Co-authored-by: Miles Alford <43789512+Miles-Alford@users.noreply.github.com>
Includes the new license key by including the shared CircleCI context
The build output path for .NET includes the .NET version. This results in us having to update both the serverless config and build commands for Linux & Windows each time we update .NET.

This change removes the version from the path. This _should_ be safe because we only build for one version, and the three locations have been updated to be consistent._
Upgrade CI deployment to Serverless Framework v4
This change resolves a build failure because Serverless Framework 4 doesn't pick up globally installed modules. I'm not sure why this has changed (or how/if it's actually changed), but it's sensible to version the dependencies and installing the plugin using 'npm install' following the docs _also_ allows the command to succeed.

An example of a failing deploy is
https://app.circleci.com/pipelines/github/LBHackney-IT/single-view-api/932/workflows/47c8895f-8506-4f12-ae69-7fc3208a9ba0/jobs/5388:

```
✖ ServerlessError2: Serverless plugin "serverless-plugin-aws-alerts" not found. Make sure it's installed and listed in the "plugins" section of your serverless config file. Use the --debug flag to learn more.
    at PluginManager.resolveServicePlugins (file:///root/.serverless/releases/4.4.14/package/dist/sf-core.js:925:2671)
    at async PluginManager.loadAllPlugins (file:///root/.serverless/releases/4.4.14/package/dist/sf-core.js:925:1293)
    at async Serverless.init (file:///root/.serverless/releases/4.4.14/package/dist/sf-core.js:932:9985)
    at async runFramework (file:///root/.serverless/releases/4.4.14/package/dist/sf-core.js:980:1336)
    at async route (file:///root/.serverless/releases/4.4.14/package/dist/sf-core.js:1010:14772)
    at async Object.run2 [as run] (file:///root/.serverless/releases/4.4.14/package/dist/sf-core.js:1010:15173)
    at async run3 (file:///root/.serverless/releases/4.4.14/package/dist/sf-core.js:1010:16435)
```
Define Serverless dependency versions
@github-advanced-security
Copy link

This pull request sets up GitHub code scanning for this repository. Once the scans have completed and the checks have passed, the analysis results for this pull request branch will appear on this overview. Once you merge this pull request, the 'Security' tab will show more code scanning analysis results (for example, for the default branch). Depending on your configuration and choice of analysis tool, future pull requests will be annotated with code scanning analysis results. For more information about GitHub code scanning, check out the documentation.

@Duslerke Duslerke merged commit 39bb1ae into development Feb 26, 2026
46 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants