Skip to content

Commit

Permalink
chore: remove legacy scripts and GH workflow bandaids
Browse files Browse the repository at this point in the history
  • Loading branch information
Mohammer5 committed Jul 11, 2024
1 parent 26e2ca2 commit 1aff6ad
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/dhis2-deploy-netlify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
- uses: c-hive/gha-yarn-cache@v1
- run: yarn install --frozen-lockfile

- run: yarn build:legacy
- run: yarn build

- uses: nwtgck/[email protected]
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dhis2-preview-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
- uses: c-hive/gha-yarn-cache@v1
- run: yarn install --frozen-lockfile

- run: yarn build:legacy
- run: yarn build

- name: Deploy
id: netlify-deploy
Expand Down
8 changes: 3 additions & 5 deletions .github/workflows/dhis2-verify-lib.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:
NODE_OPTIONS=--openssl-legacy-provider yarn setup
- name: Build
run: yarn build:legacy
run: yarn build

- run: ./scripts/create-artifact.sh

Expand Down Expand Up @@ -147,7 +147,8 @@ jobs:
- name: End-to-End tests
uses: cypress-io/github-action@v6
with:
start: 'yarn cy:start:legacy'
# This should be a command that starts the server to test against.
start: 'yarn cy:start'
wait-on: 'http://localhost:5000'
wait-on-timeout: 300
record: ${{ env.SHOULD_RECORD }}
Expand Down Expand Up @@ -185,9 +186,6 @@ jobs:
# ensure that d2-app-scripts is available
- run: yarn install --frozen-lockfile

# FIXME: Add legacy npm to allow our broken peerdeps for now.
# This should be addressed properly by fixing our peerdeps.
- run: npm i -g npm@6
- uses: dhis2/action-semantic-release@master
with:
publish-npm: true
Expand Down
3 changes: 0 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,9 @@
"scripts": {
"setup": "./scripts/setup.js",
"build": "./scripts/build-world.sh",
"build:legacy": "NODE_OPTIONS=--openssl-legacy-provider ./scripts/build-world.sh",
"build:lib": "./scripts/build.js",
"build:docs": "./scripts/build-docs.js",
"build:api": "./scripts/generate-api-docs.js",
"cy:start:legacy": "NODE_OPTIONS=--openssl-legacy-provider yarn cy:start",
"cy:start": "yarn build:lib && STORYBOOK_TESTING=1 yarn start",
"cy:open": "wait-on 'http://localhost:5000' && cypress open",
"cy:run": "wait-on 'http://localhost:5000' && cypress run",
Expand All @@ -42,7 +40,6 @@
"lint:staged": "d2-style check --staged",
"test": "d2-app-scripts test",
"start": "yarn workspace ui-storybook start",
"start:legacy": "NODE_OPTIONS=--openssl-legacy-provider yarn workspace ui-storybook start",
"start:docs": "yarn workspace ui-docusaurus start"
},
"dependencies": {
Expand Down

0 comments on commit 1aff6ad

Please sign in to comment.