Skip to content

Commit

Permalink
chore: merge master into branch
Browse files Browse the repository at this point in the history
  • Loading branch information
HoloTheDrunk committed Dec 9, 2024
2 parents c4f597b + 683e55d commit 675bb6e
Show file tree
Hide file tree
Showing 84 changed files with 2,481 additions and 1,534 deletions.
9 changes: 8 additions & 1 deletion .eslintrc.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,14 @@ module.exports = {
'plugin:@typescript-eslint/recommended',
],
rules: {
'@stylistic/max-len': ['warn', 80],
'@stylistic/max-len': ['warn', {
code: 100,
comments: 80,
ignoreUrls: true,
}],
// see https://typescript-eslint.io/rules/no-use-before-define/
'no-use-before-define': 'off',
'@typescript-eslint/no-use-before-define': 'error',
'valid-jsdoc': 'off',
'tsdoc/syntax': 'warn',
},
Expand Down
38 changes: 19 additions & 19 deletions .github/workflows/integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ jobs:
steps:

# Use specific Node.js version
- uses: actions/checkout@v3
- name: Use Node.js 18.x
uses: actions/setup-node@v3
- uses: actions/checkout@v4
- name: Use Node.js 22.x
uses: actions/setup-node@v4
with:
node-version: 18.x
node-version: 22.x
cache: 'npm'

# Install packages
Expand Down Expand Up @@ -84,11 +84,11 @@ jobs:
steps:

# Use specific Node.js version
- uses: actions/checkout@v3
- name: Use Node.js 18.x
uses: actions/setup-node@v3
- uses: actions/checkout@v4
- name: Use Node.js 22.x
uses: actions/setup-node@v4
with:
node-version: 18.x
node-version: 22.x
cache: 'npm'

# Install packages
Expand All @@ -114,11 +114,11 @@ jobs:
steps:

# Use specific Node.js version
- uses: actions/checkout@v3
- name: Use Node.js 18.x
uses: actions/setup-node@v3
- uses: actions/checkout@v4
- name: Use Node.js 22.x
uses: actions/setup-node@v4
with:
node-version: 18.x
node-version: 22.x
cache: 'npm'

# Install packages
Expand Down Expand Up @@ -149,17 +149,17 @@ jobs:
contents: write
steps:

- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
# fetch all branches
fetch-depth: 0

# Configure git user for later command induced commits
- uses: fregante/setup-git-user@v1

- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version: 18
node-version: 22.x
registry-url: https://registry.npmjs.org/

- run: npm ci
Expand Down Expand Up @@ -261,12 +261,12 @@ jobs:
runs-on: ubuntu-latest
steps:

- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Use Node.js 18.x
uses: actions/setup-node@v3
- name: Use Node.js 22.x
uses: actions/setup-node@v4
with:
node-version: 18.x
node-version: 22.x

- name: Message commit
run: echo "is RELEASE => ${{ github.event.head_commit.message }} !!"
Expand Down
1 change: 1 addition & 0 deletions CONTRIBUTORS.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ The following people have contributed to iTowns.
* [Sogelink](https://www.sogelink.com/)
* [Kévin ETOURNEAU](https://github.com/ketourneau)
* [Alexis DELFORGES](https://github.com/pourfex)
* [Tim Ebben](https://github.com/tebben)

The following organizations are the current maintainers of iTowns:
* IGN (http://www.ign.fr)
Expand Down
120 changes: 0 additions & 120 deletions examples/3dtiles_25d.html

This file was deleted.

94 changes: 0 additions & 94 deletions examples/3dtiles_basic.html

This file was deleted.

Loading

0 comments on commit 675bb6e

Please sign in to comment.