Skip to content

Commit 3167e84

Browse files
author
Grahame Grieve
committed
release prep fixes
1 parent eb8621b commit 3167e84

6 files changed

Lines changed: 59 additions & 53 deletions

File tree

.github/workflows/release.yml

Lines changed: 43 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -9,31 +9,31 @@ jobs:
99
test:
1010
name: Test
1111
runs-on: ubuntu-latest
12-
12+
1313
steps:
1414
- uses: actions/checkout@v4
15-
15+
1616
- name: Use Node.js
1717
uses: actions/setup-node@v4
1818
with:
1919
node-version: '24'
2020
cache: 'npm'
21-
21+
2222
- name: Install dependencies
2323
run: npm ci
24-
24+
2525
- name: Run tests
2626
run: npm run test:ci
2727
env:
2828
SUPPRESS_LOGS: 'true'
29-
29+
3030
- name: Upload test results
3131
uses: actions/upload-artifact@v4
3232
if: always()
3333
with:
3434
name: test-results
3535
path: ./test-results/junit.xml
36-
36+
3737
- name: Upload coverage reports
3838
uses: codecov/codecov-action@v4
3939
with:
@@ -44,16 +44,16 @@ jobs:
4444
name: Create Release
4545
runs-on: ubuntu-latest
4646
needs: test
47-
47+
4848
steps:
4949
- uses: actions/checkout@v4
5050
with:
5151
fetch-depth: 0
52-
52+
5353
- name: Get version from tag
5454
id: get_version
5555
run: echo "VERSION=${GITHUB_REF#refs/tags/}" >> $GITHUB_OUTPUT
56-
56+
5757
- name: Extract release notes from CHANGELOG.md
5858
id: extract_release_notes
5959
run: |
@@ -74,7 +74,7 @@ jobs:
7474
echo "RELEASE_NOTES<<EOF" >> $GITHUB_OUTPUT
7575
echo "$RELEASE_NOTES" >> $GITHUB_OUTPUT
7676
echo "EOF" >> $GITHUB_OUTPUT
77-
77+
7878
- name: Create GitHub Release
7979
uses: softprops/action-gh-release@v1
8080
with:
@@ -84,70 +84,70 @@ jobs:
8484
draft: false
8585
prerelease: false
8686
token: ${{ secrets.GITHUB_TOKEN }}
87-
88-
npm-publish:
89-
name: Publish to NPM
90-
runs-on: ubuntu-latest
91-
needs: test
9287

93-
steps:
94-
- uses: actions/checkout@v4
88+
npm-publish:
89+
name: Publish to NPM
90+
runs-on: ubuntu-latest
91+
needs: test
9592

96-
- name: Use Node.js
97-
uses: actions/setup-node@v4
98-
with:
99-
node-version: '20'
100-
cache: 'npm'
101-
registry-url: 'https://registry.npmjs.org'
93+
steps:
94+
- uses: actions/checkout@v4
10295

103-
- name: Install dependencies
104-
run: npm ci
96+
- name: Use Node.js
97+
uses: actions/setup-node@v4
98+
with:
99+
node-version: '24'
100+
cache: 'npm'
101+
registry-url: 'https://registry.npmjs.org'
105102

106-
- name: Get version from tag
107-
id: get_version
108-
run: |
109-
VERSION=${GITHUB_REF#refs/tags/v}
110-
echo "VERSION=$VERSION" >> $GITHUB_OUTPUT
103+
- name: Install dependencies
104+
run: npm ci
111105

112-
- name: Update package.json version
113-
run: npm version ${{ steps.get_version.outputs.VERSION }} --no-git-tag-version
106+
- name: Get version from tag
107+
id: get_version
108+
run: |
109+
VERSION=${GITHUB_REF#refs/tags/v}
110+
echo "VERSION=$VERSION" >> $GITHUB_OUTPUT
114111
115-
- name: Publish to npm
116-
run: npm publish --access public
117-
env:
118-
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
112+
- name: Update package.json version
113+
run: npm version ${{ steps.get_version.outputs.VERSION }} --no-git-tag-version
114+
115+
- name: Publish to npm
116+
run: npm publish --access public
117+
env:
118+
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
119119

120-
docker:
120+
docker:
121121
name: Build and Push Docker Image
122122
runs-on: ubuntu-latest
123123
needs: release
124124
permissions:
125125
contents: read
126126
packages: write
127-
127+
128128
steps:
129129
- uses: actions/checkout@v4
130-
130+
131131
- name: Get version from tag
132132
id: get_version
133133
run: |
134134
VERSION=${GITHUB_REF#refs/tags/}
135135
echo "VERSION=$VERSION" >> $GITHUB_OUTPUT
136136
echo "VERSION_NO_V=${VERSION#v}" >> $GITHUB_OUTPUT
137-
137+
138138
- name: Set lowercase repository name
139139
run: echo "REPO_LC=${GITHUB_REPOSITORY,,}" >> $GITHUB_ENV
140-
140+
141141
- name: Set up Docker Buildx
142142
uses: docker/setup-buildx-action@v3
143-
143+
144144
- name: Login to GitHub Container Registry
145145
uses: docker/login-action@v3
146146
with:
147147
registry: ghcr.io
148148
username: ${{ github.repository_owner }}
149149
password: ${{ secrets.GITHUB_TOKEN }}
150-
150+
151151
- name: Build and push
152152
uses: docker/build-push-action@v5
153153
with:
@@ -161,4 +161,3 @@ docker:
161161
cache-to: type=gha,mode=max
162162
build-args: |
163163
VERSION=${{ steps.get_version.outputs.VERSION_NO_V }}
164-

CHANGELOG.md

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,27 @@ All notable changes to the Health Intersections Node Server will be documented i
55
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
66
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
77

8+
## [v0.3.0] - 2026-02-05
9+
### Added
10+
- Add first draft of publishing engine
11+
12+
### Changed
13+
- Move all runtime files to a data directory, where an environment variable says. Existing configurations MUST change
14+
- Finish porting the terminology server
15+
- Lots of QA related changes, and consistency.
16+
817
## [v0.2.0] - 2026-01-13
918
### Added
1019
- port tx.fhir.org to FHIRsmith, and pass all the tests
1120

1221
### Changed
1322
- rework logging, testing, etc infrastructure
1423

15-
16-
## [v0.1.0] - 2025-08-21
24+
## [v0.1.1] - 2025-08-21
1725
### Added
1826
- set up ci and release workflows with Docker
1927
- Add tx-reg implementation
20-
-
21-
-
28+
2229
### Changed
2330

2431
- rework logging from scratch
@@ -33,4 +40,3 @@ First Documented Release
3340
- XIG Module: The Cross-IG Resource server
3441
- Packages Modules: The server for packages2.fhir.org/packages
3542
- Testing Infrastructure
36-

packages/packages.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1699,6 +1699,7 @@ class PackagesModule {
16991699
Author,
17001700
License,
17011701
Hash,
1702+
GUID,
17021703
Description
17031704
FROM PackageVersions
17041705
WHERE Id = ?
@@ -1898,7 +1899,7 @@ class PackagesModule {
18981899

18991900
for (const pv of sortedVersions) {
19001901
table += '<tr>';
1901-
table += `<td><strong>${this.escapeHtml(pv.Version)}</strong></td>`;
1902+
table += `<td title="${this.escapeHtml(pv.GUID)}"><strong>${this.escapeHtml(pv.Version)}</strong></td>`;
19021903
table += `<td>${this.escapeHtml(this.interpretVersion(pv.FhirVersions))}</td>`;
19031904
table += `<td>${this.escapeHtml(this.codeForKind(pv.Kind))}</td>`;
19041905
table += `<td>${new Date(pv.PubDate).toLocaleDateString()}</td>`;

tests/vs/vs-vsac.test.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ describe('VSACValueSetProvider', () => {
2323
}
2424

2525
try {
26-
// Check rate limiting
26+
// Check rate limiting - minimise load on vsac
2727
if (await shouldSkipDueToRateLimit()) {
2828
console.log(`Skipping VSAC tests due to rate limiting (max once every ${RATE_LIMIT_HOURS} hours)`);
2929
shouldSkipTests = true;
@@ -274,7 +274,7 @@ describe('VSACValueSetProvider', () => {
274274
if (results.length > 0) {
275275
// All results should have publisher containing 'Optum'
276276
for (const vs of results) {
277-
expect(vs.publisher).toContain('Optum');
277+
expect(vs.jsonObj.publisher).toContain('Optum');
278278
}
279279

280280
console.log(`Found ${results.length} ValueSets from Optum`);

tx/vs/vs-vsac.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ class VSACValueSetProvider extends AbstractValueSetProvider {
283283
return [];
284284
}
285285

286-
return await this.database.search(this.spaceId, searchParams, elements);
286+
return await this.database.search(this.spaceId, this.valueSetMap, searchParams, elements);
287287
}
288288

289289
/**

0 commit comments

Comments
 (0)