Skip to content

Commit

Permalink
test(temp): trying
Browse files Browse the repository at this point in the history
  • Loading branch information
gchoqueux committed Dec 6, 2024
1 parent 0bcec27 commit a6179f1
Show file tree
Hide file tree
Showing 5 changed files with 43 additions and 34 deletions.
63 changes: 33 additions & 30 deletions .github/workflows/integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ jobs:
include:
- package: "@gchoqueux/geographic"
path: "Geographic"
- package: "itowns"
- package: "@gchoqueux/itowns"
path: "Main"
steps:

Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:

Expand Down Expand Up @@ -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:

Expand Down
7 changes: 6 additions & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
1 change: 1 addition & 0 deletions packages/Debug/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion packages/Main/package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down

0 comments on commit a6179f1

Please sign in to comment.