Skip to content

Commit 10ab813

Browse files
francisco-videira-nhsfrancisco-videira-nhs
committed
take csharp server out
1 parent a6b7c23 commit 10ab813

File tree

5 files changed

+66
-103
lines changed

5 files changed

+66
-103
lines changed

‎.github/workflows/stage-3-build.yaml‎

Lines changed: 13 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ on:
3838

3939
permissions:
4040
id-token: write # This is required for requesting the JWT
41-
contents: read # This is required for actions/checkout
41+
contents: read # This is required for actions/checkout
4242
jobs:
4343
artefact-jekyll-docs:
4444
name: "Build Docs"
@@ -64,17 +64,18 @@ jobs:
6464
with:
6565
version: "${{ inputs.version }}"
6666

67-
artefact-servers:
68-
name: "Build servers"
69-
runs-on: ubuntu-latest
70-
timeout-minutes: 10
71-
steps:
72-
- name: "Checkout code"
73-
uses: actions/checkout@v4
74-
- name: "Build servers"
75-
uses: ./.github/actions/build-server
76-
with:
77-
version: "${{ inputs.version }}"
67+
# Take out for now - might add again in the future
68+
# artefact-servers:
69+
# name: "Build servers"
70+
# runs-on: ubuntu-latest
71+
# timeout-minutes: 10
72+
# steps:
73+
# - name: "Checkout code"
74+
# uses: actions/checkout@v4
75+
# - name: "Build servers"
76+
# uses: ./.github/actions/build-server
77+
# with:
78+
# version: "${{ inputs.version }}"
7879

7980
artefact-libs:
8081
name: "Build libs"
@@ -109,38 +110,3 @@ jobs:
109110
runId: "${{ github.run_id }}"
110111
buildSandbox: true
111112
releaseVersion: ${{ github.head_ref || github.ref_name }}
112-
113-
# artefact-1:
114-
# name: "Artefact 1"
115-
# runs-on: ubuntu-latest
116-
# timeout-minutes: 3
117-
# steps:
118-
# - name: "Checkout code"
119-
# uses: actions/checkout@v4
120-
# - name: "Build artefact 1"
121-
# run: |
122-
# echo "Building artefact 1 ..."
123-
# - name: "Check artefact 1"
124-
# run: |
125-
# echo "Checking artefact 1 ..."
126-
# - name: "Upload artefact 1"
127-
# run: |
128-
# echo "Uploading artefact 1 ..."
129-
# # Use either action/cache or action/upload-artifact
130-
# artefact-n:
131-
# name: "Artefact n"
132-
# runs-on: ubuntu-latest
133-
# timeout-minutes: 3
134-
# steps:
135-
# - name: "Checkout code"
136-
# uses: actions/checkout@v4
137-
# - name: "Build artefact n"
138-
# run: |
139-
# echo "Building artefact n ..."
140-
# - name: "Check artefact n"
141-
# run: |
142-
# echo "Checking artefact n ..."
143-
# - name: "Upload artefact n"
144-
# run: |
145-
# echo "Uploading artefact n ..."
146-
# # Use either action/cache or action/upload-artifact

‎.github/workflows/stage-5-publish.yaml‎

Lines changed: 49 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -93,11 +93,12 @@ jobs:
9393
path: ./artifacts/api-oas-specification-${{ inputs.version }}
9494
name: api-oas-specification-${{ inputs.version }}
9595

96-
- name: "Get the artefacts 9"
97-
uses: actions/download-artifact@v4
98-
with:
99-
path: ./artifacts/server-csharp-${{ inputs.version }}
100-
name: server-csharp-${{ inputs.version }}
96+
# Take out for now - might add again in the future
97+
# - name: "Get the artefacts 9"
98+
# uses: actions/download-artifact@v4
99+
# with:
100+
# path: ./artifacts/server-csharp-${{ inputs.version }}
101+
# name: server-csharp-${{ inputs.version }}
101102

102103
- name: "Create release"
103104
id: create_release
@@ -222,48 +223,51 @@ jobs:
222223
asset_name: api-oas-specification-${{ inputs.version }}.zip
223224
asset_content_type: "application/gzip"
224225

225-
- name: "zip csharp server release asset"
226-
# Git hub pages needs a single tar called artifact inside the zip.
227-
working-directory: ./artifacts/server-csharp-${{ inputs.version }}
228-
run: zip -r ../server-csharp-${{ inputs.version }}.zip .
229-
shell: bash
226+
# Take out for now - might add again in the future
227+
# - name: "zip csharp server release asset"
228+
# # Git hub pages needs a single tar called artifact inside the zip.
229+
# working-directory: ./artifacts/server-csharp-${{ inputs.version }}
230+
# run: zip -r ../server-csharp-${{ inputs.version }}.zip .
231+
# shell: bash
230232

231-
- name: "Upload csharp server release asset"
232-
uses: actions/upload-release-asset@v1
233-
env:
234-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
235-
with:
236-
upload_url: "${{ steps.create_release.outputs.upload_url }}"
237-
asset_path: ./artifacts/server-csharp-${{ inputs.version }}.zip
238-
asset_name: server-csharp-${{ inputs.version }}.zip
239-
asset_content_type: "application/gzip"
233+
# Take out for now - might add again in the future
234+
# - name: "Upload csharp server release asset"
235+
# uses: actions/upload-release-asset@v1
236+
# env:
237+
# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
238+
# with:
239+
# upload_url: "${{ steps.create_release.outputs.upload_url }}"
240+
# asset_path: ./artifacts/server-csharp-${{ inputs.version }}.zip
241+
# asset_name: server-csharp-${{ inputs.version }}.zip
242+
# asset_content_type: "application/gzip"
240243

241-
### PUBLISH DOCKER - THIS NEEDS CHANGING TO DO THE DOCKER BUILD IN THE BUILD STAGE AND ARTIFACT IT. SEE publishlibhostdocker below how how and the buildlibs action.
242-
publishdocker:
243-
name: "Publish docker packages"
244-
runs-on: ubuntu-latest
245-
needs: [publish]
246-
permissions:
247-
packages: write
248-
contents: read
249-
steps:
250-
- name: "Get the artefacts csharp docker"
251-
uses: actions/download-artifact@v4
252-
with:
253-
path: .
254-
name: server-csharp-docker-${{ inputs.version }}
255-
- name: "Get the artefacts csharp server"
256-
uses: actions/download-artifact@v4
257-
with:
258-
path: ./csharp-server
259-
name: server-csharp-${{ inputs.version }}
260-
- run: ls -la
261-
- run: |
262-
docker build . -t ghcr.io/nhsdigital/nhsnotifysupplierserver:latest
263-
echo $CR_PAT | docker login ghcr.io -u nhs-notify-supplier-api --password-stdin
264-
docker push ghcr.io/nhsdigital/nhsnotifysupplierserver:latest
265-
env:
266-
CR_PAT: ${{ secrets.GITHUB_TOKEN }}
244+
# Take out for now - might add again in the future
245+
# ### PUBLISH DOCKER - THIS NEEDS CHANGING TO DO THE DOCKER BUILD IN THE BUILD STAGE AND ARTIFACT IT. SEE publishlibhostdocker below how how and the buildlibs action.
246+
# publishdocker:
247+
# name: "Publish docker packages"
248+
# runs-on: ubuntu-latest
249+
# needs: [publish]
250+
# permissions:
251+
# packages: write
252+
# contents: read
253+
# steps:
254+
# - name: "Get the artefacts csharp docker"
255+
# uses: actions/download-artifact@v4
256+
# with:
257+
# path: .
258+
# name: server-csharp-docker-${{ inputs.version }}
259+
# - name: "Get the artefacts csharp server"
260+
# uses: actions/download-artifact@v4
261+
# with:
262+
# path: ./csharp-server
263+
# name: server-csharp-${{ inputs.version }}
264+
# - run: ls -la
265+
# - run: |
266+
# docker build . -t ghcr.io/nhsdigital/nhsnotifysupplierserver:latest
267+
# echo $CR_PAT | docker login ghcr.io -u nhs-notify-supplier-api --password-stdin
268+
# docker push ghcr.io/nhsdigital/nhsnotifysupplierserver:latest
269+
# env:
270+
# CR_PAT: ${{ secrets.GITHUB_TOKEN }}
267271

268272
### PUBLISH NUGET
269273
publishnuget:

‎Makefile‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ dependencies: # Install dependencies needed to build and test the project @Pipel
1111
# TODO: Implement installation of your project dependencies
1212

1313
build: # Build the project artefact @Pipeline
14-
(cd server && make build)
14+
# Take out for now - might add again in the future
15+
# (cd server && make build)
1516
(cd sdk && make build)
1617
(cd docs && make build)
1718
(cd src/server && make build)

‎README.md‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ This repository documents the Supplier API specification and provides an SDK wit
2929
- [Setup](#setup)
3030
- [Prerequisites and Configuration](#prerequisites-and-configuration)
3131
- [SDKs](#sdks)
32-
- [Servers](#servers)
3332
- [Libs](#libs)
3433
- [Build](#build)
3534
- [GitHub Actions CI/CD](#github-actions-cicd)
@@ -75,9 +74,7 @@ New developer of the NHS Notify Supplier API should understand the below.
7574
### Pre built servers
7675

7776
- "Working" C# server [/src/server/host](/src/server/host) `docker run -p 8080:8080 ghcr.io/nhsdigital/libshostdocker:latest`
78-
- View at [http://localhost:8080/swagger/index.html](http://localhost:8080/swagger/index.html)
79-
- Docker OAS example Server (csharp) `docker run -p 3000:3000 ghcr.io/nhsdigital/nhsnotifysupplierserver:latest`
80-
- CSharp `server-csharp-[Version].zip`
77+
- OAS preview at [http://localhost:8080/swagger/index.html](http://localhost:8080/swagger/index.html)
8178

8279
### Setup
8380

@@ -95,11 +92,6 @@ New developer of the NHS Notify Supplier API should understand the below.
9592
and will be built as part of the CI/CD pipeline and released as a GitHub
9693
release.
9794

98-
##### Servers
99-
100-
- Servers folder is being built at build time from OAS specs.
101-
- TODO:CCM-12139 Build actual servers
102-
10395
##### Libs
10496

10597
- [/src/server](/src/server) has various separate libraries that are used by:

‎internal/datastore/src/types.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Data Store Schemas
1+
## Data Store Schemas
22

33
This document contains the mermaid diagrams for the data store schemas used in the application.
44

0 commit comments

Comments
 (0)