Skip to content

Commit

Permalink
Remove NPM link scripts and GHA workflows
Browse files Browse the repository at this point in the history
  • Loading branch information
lukehb committed Nov 21, 2024
1 parent 87956a7 commit 296dc87
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 18 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/create-gh-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,15 +45,15 @@ jobs:

- name: Build frontend library
working-directory: ./Frontend/library
run: npm ci && npm link ../../Common && npm run build
run: npm ci && npm run build

- name: Build frontend ui-library
working-directory: ./Frontend/ui-library
run: npm ci && npm link ../library && npm run build
run: npm ci && npm run build

- name: Install implementations/typescript deps
working-directory: ./Frontend/implementations/typescript
run: npm ci && npm link ../../library ../../ui-library && npm run build
run: npm ci && npm run build

- name: Move all content into output directory for archiving
run: items=(*) && mkdir PixelStreamingInfrastructure-${{ github.ref_name }}-${{ steps.getversion.outputs.version }} && mv ${items[*]} PixelStreamingInfrastructure-${{ github.ref_name }}-${{ steps.getversion.outputs.version }}/
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/healthcheck-libraries.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,21 +41,21 @@ jobs:

- name: Clean build and lint checks on signalling library
working-directory: Signalling
run: npm ci && npm link ../Common && npm run build && npm run lint
run: npm ci && npm run build && npm run lint

- name: Clean build and lint checks on wilbur
working-directory: SignallingWebServer
run: npm ci && npm link ../Signalling && npm run build && npm run lint
run: npm ci && npm run build && npm run lint

- name: Clean build, lint and unit tests on frontend library
working-directory: Frontend/library
run: npm ci && npm link ../../Common && npm run build && npm run lint && npm run test
run: npm ci && npm run build && npm run lint && npm run test

- name: Clean build and lint checks on frontend ui library
working-directory: Frontend/ui-library
run: npm ci && npm link ../library && npm run build && npm run lint
run: npm ci && npm run build && npm run lint

- name: Clean build of frontend implementation
working-directory: Frontend/implementations/typescript
run: npm ci && npm link ../../library ../../ui-library && npm run build
run: npm ci && npm run build

5 changes: 0 additions & 5 deletions .github/workflows/healthcheck-streaming.yml
Original file line number Diff line number Diff line change
Expand Up @@ -75,36 +75,31 @@ jobs:
working-directory: Signalling
run: |
npm ci
npm link ../Common
npm run build
- name: Build Wilbur
working-directory: SignallingWebServer
run: |
npm ci
npm link ../Signalling
npm run build
- name: Build Frontend lib
working-directory: Frontend/library
run: |
npm ci
npm link ../../Common
npm run build
- name: Build Frontend ui lib
working-directory: Frontend/ui-library
run: |
npm ci
npm link ../library
npm run build
- name: Build Frontend implementation
working-directory: Frontend/implementations/typescript
run: |
$Env:WEBPACK_OUTPUT_PATH='${{ github.workspace }}\www'
npm ci
npm link ../../library ../../ui-library
npm run build
- name: Run Signalling
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish-signalling-library-to-npm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
registry-url: 'https://registry.npmjs.org'
- working-directory: Common
run: npm ci && npm run build
- run: npm ci && npm link ../Common && npm run build
- run: npm ci && npm run build
- run: npm publish --access public
env:
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
3 changes: 0 additions & 3 deletions SignallingWebServer/platform_scripts/bash/common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -212,17 +212,14 @@ function setup_frontend() {
popd > /dev/null
pushd ${SCRIPT_DIR}/../../../Frontend/library > /dev/null
${SCRIPT_DIR}/node/bin/npm install
${SCRIPT_DIR}/node/bin/npm link ../../Common
${SCRIPT_DIR}/node/bin/npm run build
popd > /dev/null
pushd ${SCRIPT_DIR}/../../../Frontend/ui-library > /dev/null
${SCRIPT_DIR}/node/bin/npm install
${SCRIPT_DIR}/node/bin/npm link ../library
${SCRIPT_DIR}/node/bin/npm run build
popd > /dev/null
pushd ${SCRIPT_DIR}/../../../Frontend/implementations/typescript > /dev/null
${SCRIPT_DIR}/node/bin/npm install
${SCRIPT_DIR}/node/bin/npm link ../../library ../../ui-library
${SCRIPT_DIR}/node/bin/npm run build
popd > /dev/null
else
Expand Down
1 change: 0 additions & 1 deletion SignallingWebServer/platform_scripts/cmd/common.bat
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,6 @@ set PATH=%NODE_DIR%;%PATH%
IF "%FORCE_BUILD%"=="1" (
rem We could replace this all with a single npm script that does all this. we do have several build-all scripts already
rem but this does give a good reference about the dependency chain for all of this.
rem Note: npm link will also run npm install so we dont need that here
echo Building common library...
echo ----------------------------
pushd %CD%\Common
Expand Down

0 comments on commit 296dc87

Please sign in to comment.