From 35691182366e127f1b2d9a750f73658fe53e7be2 Mon Sep 17 00:00:00 2001 From: gchoqueux Date: Wed, 4 Dec 2024 16:54:16 +0100 Subject: [PATCH] test(temp): trying --- .github/workflows/integration.yml | 63 ++++++++++++++++--------------- package-lock.json | 7 +++- package.json | 4 +- packages/Debug/package.json | 1 + packages/Main/package.json | 2 +- 5 files changed, 43 insertions(+), 34 deletions(-) diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index 3f63810c2a..fc5657ebcb 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -85,7 +85,7 @@ jobs: include: - package: "@gchoqueux/geographic" path: "Geographic" - - package: "itowns" + - package: "@gchoqueux/itowns" path: "Main" steps: @@ -129,39 +129,40 @@ jobs: parallel-finished: true github-token: ${{ secrets.GITHUB_TOKEN }} # Functional tests - functional-tests: - name: Functional tests - needs: build - runs-on: ubuntu-latest - steps: - - # Use specific Node.js version - - uses: actions/checkout@v4 - - name: Use Node.js 22.x - uses: actions/setup-node@v4 - with: - node-version: 22.x - cache: 'npm' - - # Install packages - - name: Install packages - run: npm ci - - # Download artifact from build - - name: Download itowns bundle - uses: actions/download-artifact@v4 - with: - name: dist-itowns - - - name: Run functional tests - run: npm run test-functional + # functional-tests: + # name: Functional tests + # needs: build + # runs-on: ubuntu-latest + # steps: + + # # Use specific Node.js version + # - uses: actions/checkout@v4 + # - name: Use Node.js 22.x + # uses: actions/setup-node@v4 + # with: + # node-version: 22.x + # cache: 'npm' + + # # Install packages + # - name: Install packages + # run: npm ci + + # # Download artifact from build + # - name: Download itowns bundle + # uses: actions/download-artifact@v4 + # with: + # name: dist-itowns + + # - name: Run functional tests + # run: npm run test-functional # Publish NPM package publish: name: Publish NPM package if: ${{ github.ref == 'refs/heads/master' }} - needs: [finish-coverage, functional-tests] + # needs: [finish-coverage, functional-tests] + needs: [finish-coverage] runs-on: ubuntu-latest permissions: # id-token: write permission is required for npm provenance: @@ -218,7 +219,8 @@ jobs: deploy: name: Deploy to itowns.github.io if: ${{ github.ref == 'refs/heads/master' }} - needs: [finish-coverage, functional-tests] + # needs: [finish-coverage, functional-tests] + needs: [finish-coverage] runs-on: ubuntu-latest steps: @@ -279,7 +281,8 @@ jobs: release: name: Release GitHub if: ${{ github.ref == 'refs/heads/master' && startsWith( github.event.head_commit.message, 'release v' ) }} - needs: [finish-coverage, functional-tests] + # needs: [finish-coverage, functional-tests] + needs: [finish-coverage] runs-on: ubuntu-latest steps: diff --git a/package-lock.json b/package-lock.json index bbc2a8d788..3eb95f467b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2639,6 +2639,10 @@ "resolved": "packages/Geographic", "link": true }, + "node_modules/@gchoqueux/itowns": { + "resolved": "packages/Main", + "link": true + }, "node_modules/@humanwhocodes/config-array": { "version": "0.13.0", "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.13.0.tgz", @@ -15804,6 +15808,7 @@ "version": "2.44.2", "license": "(CECILL-B OR MIT)", "dependencies": { + "@gchoqueux/geographic": "^2.44.2", "@tweenjs/tween.js": "^25.0.0", "chart.js": "^4.4.4", "dat.gui": "^0.7.9", @@ -15833,7 +15838,7 @@ } }, "packages/Main": { - "name": "itowns", + "name": "@gchoqueux/itowns", "version": "2.44.2", "hasInstallScript": true, "license": "(CECILL-B OR MIT)", diff --git a/package.json b/package.json index a0b9a058dc..29a83f04d0 100644 --- a/package.json +++ b/package.json @@ -30,8 +30,8 @@ "watch": "node ./config/concurrently.mjs watch", "changelog": "conventional-changelog -n ./config/conventionalChangelog/config.cjs -i changelog.md -s", "bump": "if [ -z $npm_config_level ]; then grunt bump:minor; else grunt bump:$npm_config_level; fi && npm run changelog && npm run update-packages && npm install && git add -A && git commit --amend --no-edit", - "publish-next": "npm run publish-next -workspaces --if-present && npm publish --access public --tag=next --workspaces --provenance", - "publish-latest": "npm publish --access public --tag=latest --provenance --workspaces", + "publish-next": "npm run publish-next -workspaces --if-present && npm publish --access public --tag=next --workspaces", + "publish-latest": "npm publish --access public --tag=latest --workspaces", "update-packages": "npm run update-package -workspaces --if-present" }, "c8": { diff --git a/packages/Debug/package.json b/packages/Debug/package.json index a6fd50fb83..c2c86bc303 100644 --- a/packages/Debug/package.json +++ b/packages/Debug/package.json @@ -26,6 +26,7 @@ }, "homepage": "https://itowns.github.io/", "dependencies": { + "@gchoqueux/geographic": "^2.44.2", "chart.js": "^4.4.4", "dat.gui": "^0.7.9", "itowns": "^2.44.2", diff --git a/packages/Main/package.json b/packages/Main/package.json index 6390f72240..b4701644ce 100644 --- a/packages/Main/package.json +++ b/packages/Main/package.json @@ -1,5 +1,5 @@ { - "name": "itowns", + "name": "@gchoqueux/itowns", "version": "2.44.2", "description": "A JS/WebGL framework for 3D geospatial data visualization", "type": "module",