Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

serializer: adding pricing plans (marketplace) field in serializer #36

Merged
merged 8 commits into from
Apr 12, 2024
Merged

serializer: adding pricing plans (marketplace) field in serializer #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
711eb1c
serializer: adding pricing plans (marketplace) field in serializer
M3nin0 Apr 11, 2024
ea79d8b
package: locking dependencies
M3nin0 Apr 11, 2024
470420a
build: reviewing build scripts
M3nin0 Apr 11, 2024
1b5e610
build: updating npm authentication tool
M3nin0 Apr 11, 2024
099fbf9
package: locking dependencies
M3nin0 Apr 12, 2024
fd0dcd1
actions: updating install command
M3nin0 Apr 12, 2024
f56c062
build: updating integrity regualizer
M3nin0 Apr 12, 2024
7c589d6
serializer: fixing code style
M3nin0 Apr 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions .github/workflows/node.js.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:

strategy:
matrix:
node-version: [14.x]
node-version: [18.x]

steps:
- name: Checkout
Expand All @@ -38,7 +38,9 @@ jobs:

- name: Install & Build
run: |
npm install
echo @geo-knowledge-hub:registry=http://127.0.0.1:4873 > ~/.npmrc

npm --legacy-peer-deps install
npm run build

- name: Lint
Expand Down
8 changes: 8 additions & 0 deletions docker/builder/services/integrity-regularizer/app.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,18 @@
# 2. Getting dependencies
#
dependencies = package_json["dependencies"]
packages = package_json["packages"]

#
# 3. Removing dependencies from GEO Knowledge Hub packages installed from GitHub
#

# Packages
for depkey in packages.keys():
if "@geo-knowledge-hub" in depkey and "integrity" in packages[depkey]:
del packages[depkey]["integrity"]

# Dependencies
for depkey in dependencies.keys():
if "@geo-knowledge-hub" in depkey and "integrity" in dependencies[depkey]:
del dependencies[depkey]["integrity"]
Expand Down
17 changes: 12 additions & 5 deletions docker/builder/start.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,21 +40,28 @@ docker compose -f docker/builder/docker-compose.yml up -d
#

# installing utility tool to auth
npm install -g npm-cli-login
npm install -g npm-cli-adduser

# authenticating
npm-cli-login \
npm-cli-adduser \
-u $VERDACCIO_USERNAME \
-p $VERDACCIO_PASSWORD \
-e $VERDACCIO_EMAIL \
-r $VERDACCIO_LOCAL_REGISTRY

echo @geo-knowledge-hub:registry=${VERDACCIO_DOCKER_REGISTRY} > ~/.npmrc

#
# 3. Publishing JavaScript dependencies from `geo-components-react` to verdaccio
#

# build required dependencies
npm install -g rimraf json rollup

# registering the local registry
echo "@geo-knowledge-hub:registry=${VERDACCIO_DOCKER_REGISTRY}" >> ~/.npmrc

# configuring npm to be compatible with Node 16
echo "legacy-peer-deps=true" >> ~/.npmrc

# extract the dependencies from the `geo-knowledge-hub`
# note: `@geo-knowledge-hub` is the scope defined to the `geo-knowledge-hub` packages
JAVASCRIPT_DEPENDENCIES_VERSION=`cat package.json | grep -e @geo-knowledge-hub/ | tail -n 4 | head -n 2`
Expand Down Expand Up @@ -91,7 +98,7 @@ do
# (Example where the issue is discussed: https://github.com/npm/cli/issues/2846)
python3 ${INTEGRITY_REGULARIZER}

npm install
npm --legacy-peer-deps install
npm run build
npm publish --registry $VERDACCIO_LOCAL_REGISTRY

Expand Down
Loading
Loading