Skip to content

Commit

Permalink
chore: temp change package name
Browse files Browse the repository at this point in the history
  • Loading branch information
gchoqueux committed May 30, 2024
1 parent 37a02bb commit e01c128
Show file tree
Hide file tree
Showing 90 changed files with 145 additions and 129 deletions.
90 changes: 53 additions & 37 deletions .github/workflows/integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,22 @@ on:

jobs:

test-repo:
name: test repo name ++
if: ${{ github.repository_owner == 'gchoqueux' }}
runs-on: ubuntu-latest
steps:
# Use specific Node.js version
- uses: actions/checkout@v3
- name: name repo
run: echo 'gchoqueux repository'

# Build bundle, doc and check linter
build:
name: Build bundle, check Linter and generate documentation
runs-on: ubuntu-latest
needs: test-repo

steps:

# Use specific Node.js version
Expand Down Expand Up @@ -44,7 +56,7 @@ jobs:

# Build documentation
- name: Build documentation
if: ${{ success() && github.ref == 'refs/heads/master' }}
# if: ${{ success() && github.ref == 'refs/heads/master' }}
run: npm run doc -- -d buildDocs

# Prepare archive for deploying
Expand Down Expand Up @@ -83,9 +95,9 @@ jobs:
strategy:
matrix:
include:
- package: "@itowns/geodesy"
- package: "@itowns_gc/geodesy"
path: "Geodesy"
- package: "itowns"
- package: "itowns_gc"
path: "Main"
steps:

Expand Down Expand Up @@ -129,39 +141,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@v3
- name: Use Node.js 18.x
uses: actions/setup-node@v3
with:
node-version: 18.x
cache: 'npm'

# Install packages
- name: Install packages
run: npm ci

# Download artifact from build
- name: Download itowns bundle
uses: actions/download-artifact@v3
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@v3
# - name: Use Node.js 18.x
# uses: actions/setup-node@v3
# with:
# node-version: 18.x
# cache: 'npm'

# # Install packages
# - name: Install packages
# run: npm ci

# # Download artifact from build
# - name: Download itowns bundle
# uses: actions/download-artifact@v3
# 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]
# if: ${{ github.ref == 'refs/heads/master' }}
# 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 @@ -217,8 +230,9 @@ jobs:
# Deploy on itowns.github.io website
deploy:
name: Deploy to itowns.github.io
if: ${{ github.ref == 'refs/heads/master' }}
needs: [finish-coverage, functional-tests, check-commit-message]
# if: ${{ github.ref == 'refs/heads/master' }}
# needs: [finish-coverage, functional-tests, check-commit-message]
needs: [finish-coverage, check-commit-message]
runs-on: ubuntu-latest
steps:

Expand Down Expand Up @@ -256,7 +270,7 @@ jobs:
uses: peaceiris/actions-gh-pages@v3
with:
deploy_key: ${{ secrets.ACTIONS_DEPLOY_KEY }}
external_repository: iTowns/itowns.github.io
external_repository: gchoqueux/itowns.github.io
publish_dir: ./itowns
destination_dir: ./itowns
publish_branch: master
Expand All @@ -271,7 +285,7 @@ jobs:
uses: peaceiris/actions-gh-pages@v3
with:
deploy_key: ${{ secrets.ACTIONS_DEPLOY_KEY }}
external_repository: iTowns/itowns.github.io
external_repository: gchoqueux/itowns.github.io
publish_dir: ./itowns
destination_dir: ./itowns/dev
publish_branch: master
Expand All @@ -281,8 +295,10 @@ jobs:
# Create GitHub release
release:
name: Release GitHub
if: ${{ github.ref == 'refs/heads/master' && startsWith( github.event.head_commit.message, 'release v' ) }}
needs: [finish-coverage, functional-tests, check-commit-message]
# if: ${{ github.ref == 'refs/heads/master' && startsWith( github.event.head_commit.message, 'release v' ) }}
# needs: [finish-coverage, functional-tests, check-commit-message]
if: ${{ startsWith( github.event.head_commit.message, 'release v' ) }}
needs: [finish-coverage, check-commit-message]
runs-on: ubuntu-latest
steps:

Expand Down
2 changes: 1 addition & 1 deletion packages/Debug/src/3dTilesDebug.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as THREE from 'three';
import { View, GeometryLayer, C3DTilesBoundingVolumeTypes, PNTS_MODE, PNTS_SHAPE, PNTS_SIZE_MODE } from 'itowns';
import { View, GeometryLayer, C3DTilesBoundingVolumeTypes, PNTS_MODE, PNTS_SHAPE, PNTS_SIZE_MODE } from 'itowns_gc';
import GeometryDebug from './GeometryDebug';

const bboxMesh = new THREE.Mesh();
Expand Down
4 changes: 2 additions & 2 deletions packages/Debug/src/Debug.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { CameraHelper, Color, Vector3 } from 'three';
import { Coordinates } from '@itowns/geodesy';
import { MAIN_LOOP_EVENTS, OBB } from 'itowns';
import { Coordinates } from '@itowns_gc/geodesy';
import { MAIN_LOOP_EVENTS, OBB } from 'itowns_gc';
import * as THREE from 'three';
import ThreeStatsChart from './charts/ThreeStatsChart';
import { backgroundChartDiv, color_blue } from './charts/ChartConfig';
Expand Down
2 changes: 1 addition & 1 deletion packages/Debug/src/PointCloudDebug.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { PNTS_MODE, PNTS_SHAPE, PNTS_SIZE_MODE } from 'itowns';
import { PNTS_MODE, PNTS_SHAPE, PNTS_SIZE_MODE } from 'itowns_gc';

function getController(gui, name) {
let controller = null;
Expand Down
2 changes: 1 addition & 1 deletion packages/Debug/src/TileDebug.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import * as THREE from 'three';
import TWEEN from '@tweenjs/tween.js';
import GeometryLayer from 'Layer/GeometryLayer';
import { MAIN_LOOP_EVENTS } from 'itowns';
import { MAIN_LOOP_EVENTS } from 'itowns_gc';
import ObjectRemovalHelper from 'Process/ObjectRemovalHelper';
import TileObjectChart from './charts/TileObjectChart';
import TileVisibilityChart from './charts/TileVisibilityChart';
Expand Down
2 changes: 1 addition & 1 deletion packages/Geodesy/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@itowns_gc/geodesy",
"version": "2.43.1",
"version": "2.43.2-next.0",
"description": "Geodesy",
"type": "module",
"main": "lib/Main.js",
Expand Down
2 changes: 1 addition & 1 deletion packages/Gui/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@itowns_gc/gui",
"version": "2.43.1",
"version": "2.43.2-next.0",
"description": "Gui",
"type": "module",
"main": "lib/Main.js",
Expand Down
2 changes: 1 addition & 1 deletion packages/Gui/src/C3DTilesStyle.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Style, C3DTILES_LAYER_EVENTS } from 'itowns';
import { Style, C3DTILES_LAYER_EVENTS } from 'itowns_gc';
import Widget from './Widget';

const DEFAULT_OPTIONS = {
Expand Down
4 changes: 2 additions & 2 deletions packages/Gui/src/Minimap.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Coordinates } from '@itowns/geodesy';
import { MAIN_LOOP_EVENTS, PlanarView, CAMERA_TYPE } from 'itowns';
import { Coordinates } from '@itowns_gc/geodesy';
import { MAIN_LOOP_EVENTS, PlanarView, CAMERA_TYPE } from 'itowns_gc';
import Widget from './Widget';


Expand Down
2 changes: 1 addition & 1 deletion packages/Gui/src/Navigation.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { VIEW_EVENTS } from 'itowns';
import { VIEW_EVENTS } from 'itowns_gc';
import Widget from './Widget';


Expand Down
2 changes: 1 addition & 1 deletion packages/Gui/src/Scale.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { CONTROL_EVENTS, GLOBE_VIEW_EVENTS, PLANAR_CONTROL_EVENT, VIEW_EVENTS } from 'itowns';
import { CONTROL_EVENTS, GLOBE_VIEW_EVENTS, PLANAR_CONTROL_EVENT, VIEW_EVENTS } from 'itowns_gc';
import Widget from './Widget';


Expand Down
2 changes: 1 addition & 1 deletion packages/Gui/src/Searchbar.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Fetcher } from 'itowns';
import { Fetcher } from 'itowns_gc';
import Widget from './Widget';


Expand Down
4 changes: 2 additions & 2 deletions packages/Main/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "itowns_gc",
"version": "2.43.1",
"version": "2.43.2-next.0",
"description": "A JS/WebGL framework for 3D geospatial data visualization",
"type": "module",
"main": "lib/Main.js",
Expand Down Expand Up @@ -49,7 +49,7 @@
"url": "https://github.com/iTowns/itowns/issues"
},
"dependencies": {
"@itowns_gc/geodesy": "^2.43.1",
"@itowns_gc/geodesy": "^2.43.2-next.0",
"@mapbox/mapbox-gl-style-spec": "^13.28.0",
"@mapbox/vector-tile": "^1.3.1",
"@tmcw/togeojson": "^5.8.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/Main/src/Controls/GlobeControls.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import * as THREE from 'three';
import AnimationPlayer from 'Core/AnimationPlayer';
import { Coordinates, ellipsoidSizes } from '@itowns/geodesy';
import { Coordinates, ellipsoidSizes } from '@itowns_gc/geodesy';
import CameraUtils from 'Utils/CameraUtils';
import StateControl from 'Controls/StateControl';
import { VIEW_EVENTS } from 'Core/View';
Expand Down
2 changes: 1 addition & 1 deletion packages/Main/src/Converter/Feature2Mesh.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import Earcut from 'earcut';
import { FEATURE_TYPES } from 'Core/Feature';
import ReferLayerProperties from 'Layer/ReferencingLayerProperties';
import { deprecatedFeature2MeshOptions } from 'Core/Deprecated/Undeprecator';
import { Extent, CRS, Coordinates, OrientationUtils } from '@itowns/geodesy';
import { Extent, CRS, Coordinates, OrientationUtils } from '@itowns_gc/geodesy';
import Style, { StyleContext } from 'Core/Style';

const coord = new Coordinates('EPSG:4326', 0, 0, 0);
Expand Down
2 changes: 1 addition & 1 deletion packages/Main/src/Converter/Feature2Texture.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import * as THREE from 'three';
import { FEATURE_TYPES } from 'Core/Feature';
import { Extent, Coordinates } from '@itowns/geodesy';
import { Extent, Coordinates } from '@itowns_gc/geodesy';
import Style, { StyleContext } from 'Core/Style';

const defaultStyle = new Style();
Expand Down
2 changes: 1 addition & 1 deletion packages/Main/src/Converter/textureConverter.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import * as THREE from 'three';
import Feature2Texture from 'Converter/Feature2Texture';
import { Extent, CRS } from '@itowns/geodesy';
import { Extent, CRS } from '@itowns_gc/geodesy';

const extentTexture = new Extent('EPSG:4326', [0, 0, 0, 0]);

Expand Down
2 changes: 1 addition & 1 deletion packages/Main/src/Core/3DTiles/C3DTBoundingVolume.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as THREE from 'three';
import { Ellipsoid, Coordinates } from '@itowns/geodesy';
import { Ellipsoid, Coordinates } from '@itowns_gc/geodesy';
import { C3DTilesTypes, C3DTilesBoundingVolumeTypes } from './C3DTilesEnums';

const ellipsoid = new Ellipsoid();
Expand Down
2 changes: 1 addition & 1 deletion packages/Main/src/Core/Feature.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as THREE from 'three';
import { Extent, Coordinates, CRS } from '@itowns/geodesy';
import { Extent, Coordinates, CRS } from '@itowns_gc/geodesy';
import Style from 'Core/Style';

function defaultExtent(crs) {
Expand Down
2 changes: 1 addition & 1 deletion packages/Main/src/Core/Label.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import * as THREE from 'three';
import DEMUtils from 'Utils/DEMUtils';
import { Coordinates } from '@itowns/geodesy';
import { Coordinates } from '@itowns_gc/geodesy';

const coord = new Coordinates('EPSG:4326');
let rect;
Expand Down
2 changes: 1 addition & 1 deletion packages/Main/src/Core/Picking.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import * as THREE from 'three';
import RenderMode from 'Renderer/RenderMode';
import { unpack1K } from 'Renderer/LayeredMaterial';
import { Coordinates } from '@itowns/geodesy';
import { Coordinates } from '@itowns_gc/geodesy';

const depthRGBA = new THREE.Vector4();
// TileMesh picking support function
Expand Down
2 changes: 1 addition & 1 deletion packages/Main/src/Core/Prefab/Globe/Atmosphere.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

import * as THREE from 'three';
import GeometryLayer from 'Layer/GeometryLayer';
import { Coordinates, ellipsoidSizes, CoordStars } from '@itowns/geodesy';
import { Coordinates, ellipsoidSizes, CoordStars } from '@itowns_gc/geodesy';
import Sky from './SkyShader';
import skyFS from './Shaders/skyFS.glsl';
import skyVS from './Shaders/skyVS.glsl';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as THREE from 'three';
import { Coordinates, Extent } from '@itowns/geodesy';
import { Coordinates, Extent } from '@itowns_gc/geodesy';

const PI_OV_FOUR = Math.PI / 4;
const INV_TWO_PI = 1.0 / (Math.PI * 2);
Expand Down
2 changes: 1 addition & 1 deletion packages/Main/src/Core/Prefab/Globe/GlobeLayer.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import * as THREE from 'three';
import TiledGeometryLayer from 'Layer/TiledGeometryLayer';
import { ellipsoidSizes, globalExtentTMS, schemeTiles, CRS } from '@itowns/geodesy';
import { ellipsoidSizes, globalExtentTMS, schemeTiles, CRS } from '@itowns_gc/geodesy';
import BuilderEllipsoidTile from 'Core/Prefab/Globe/BuilderEllipsoidTile';
import { SIZE_DIAGONAL_TEXTURE } from 'Process/LayeredMaterialNodeProcessing';

Expand Down
2 changes: 1 addition & 1 deletion packages/Main/src/Core/Prefab/GlobeView.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import * as THREE from 'three';

import View, { VIEW_EVENTS } from 'Core/View';
import GlobeControls from 'Controls/GlobeControls';
import { Coordinates, CRS, ellipsoidSizes } from '@itowns/geodesy';
import { Coordinates, CRS, ellipsoidSizes } from '@itowns_gc/geodesy';

import GlobeLayer from 'Core/Prefab/Globe/GlobeLayer';
import Atmosphere from 'Core/Prefab/Globe/Atmosphere';
Expand Down
2 changes: 1 addition & 1 deletion packages/Main/src/Core/Prefab/Planar/PlanarLayer.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import * as THREE from 'three';

import TiledGeometryLayer from 'Layer/TiledGeometryLayer';
import { CRS, globalExtentTMS } from '@itowns/geodesy';
import { CRS, globalExtentTMS } from '@itowns_gc/geodesy';
import PlanarTileBuilder from './PlanarTileBuilder';

/**
Expand Down
2 changes: 1 addition & 1 deletion packages/Main/src/Core/Prefab/Planar/PlanarTileBuilder.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as THREE from 'three';
import { Coordinates, Extent } from '@itowns/geodesy';
import { Coordinates, Extent } from '@itowns_gc/geodesy';

const quaternion = new THREE.Quaternion();
const center = new THREE.Vector3();
Expand Down
2 changes: 1 addition & 1 deletion packages/Main/src/Core/Style.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Coordinates } from '@itowns/geodesy';
import { Coordinates } from '@itowns_gc/geodesy';
import { FEATURE_TYPES } from 'Core/Feature';
import Cache from 'Core/Scheduler/Cache';
import Fetcher from 'Provider/Fetcher';
Expand Down
2 changes: 1 addition & 1 deletion packages/Main/src/Core/TileMesh.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as THREE from 'three';
import { CRS } from '@itowns/geodesy';
import { CRS } from '@itowns_gc/geodesy';
import { geoidLayerIsVisible } from 'Layer/GeoidLayer';

/**
Expand Down
2 changes: 1 addition & 1 deletion packages/Main/src/Core/View.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as THREE from 'three';
import { CRS, Coordinates } from '@itowns/geodesy';
import { CRS, Coordinates } from '@itowns_gc/geodesy';
import Camera from 'Renderer/Camera';
import initializeWebXR from 'Renderer/WebXR';
import MainLoop, { MAIN_LOOP_EVENTS, RENDERING_PAUSED } from 'Core/MainLoop';
Expand Down
2 changes: 1 addition & 1 deletion packages/Main/src/Layer/EntwinePointTileLayer.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import * as THREE from 'three';
import EntwinePointTileNode from 'Core/EntwinePointTileNode';
import PointCloudLayer from 'Layer/PointCloudLayer';
import { Extent } from '@itowns/geodesy';
import { Extent } from '@itowns_gc/geodesy';

const bboxMesh = new THREE.Mesh();
const box3 = new THREE.Box3();
Expand Down
2 changes: 1 addition & 1 deletion packages/Main/src/Layer/InfoLayer.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Extent } from '@itowns/geodesy';
import { Extent } from '@itowns_gc/geodesy';

export default class InfoLayer {
constructor(layer) {
Expand Down
Loading

0 comments on commit e01c128

Please sign in to comment.