Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
6ba6d90
Leave only build in GitHub Workflows
propheel Mar 23, 2022
e9cc504
Merge pull request #2 from propheel/changeWorkflows
propheel Mar 23, 2022
f586b2f
Merge remote-tracking branch 'upstream/master'
propheel Apr 7, 2022
de96c91
Enable artifacts and tests with Edge
propheel Apr 8, 2022
5b629d1
Fix merge ci.yml
propheel Apr 8, 2022
f7524d4
Merge pull request #6 from propheel/modifyCi
propheel Apr 8, 2022
596af64
Merge pull request #7 from propheel/feat/updateDependencies
propheel Apr 8, 2022
3c9e6df
Make layer list sortable again
propheel Apr 8, 2022
7e43b90
Add Azure Maps extension
propheel Apr 11, 2022
c21965f
Remove unused code
propheel Apr 11, 2022
11dde57
Make sure indoor layers are visible
propheel Apr 11, 2022
4b317ea
Rework changes to support editing styles only
propheel May 18, 2022
79fd4ef
Add modal when uploading Azure Maps Style
propheel May 19, 2022
d8f76fe
Remove workaround for gzipped sprite index JSONs
propheel May 19, 2022
70c9e56
Load sprites for Azure Maps Styles
propheel May 19, 2022
a05d2df
Do not show default style set and save locally
propheel May 20, 2022
35088f4
Rename style sets to map configurations + errors
propheel Jun 20, 2022
fbcb702
Refactor Azure Maps extension and make upload work
propheel Aug 9, 2022
f8f5812
Add ModalInfo and filter editable layers
propheel Aug 18, 2022
e081614
Add ModalPrompt to confirm overwriting styles
propheel Aug 18, 2022
f67bfa9
Fix missing sources after style save
propheel Aug 19, 2022
dddc588
Updated shortcuts & performance, fixed stuff
propheel Aug 24, 2022
b0464a3
Fix saving new base map
propheel Aug 29, 2022
fdf3fa4
Pack of fixes:
propheel Sep 1, 2022
1af0a25
Pack of fixes:
propheel Sep 2, 2022
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
35 changes: 17 additions & 18 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,20 +22,20 @@ jobs:
# with:
# msg: "Demo: <https://codesandbox.io/embed/github/${{ github.repository }}/tree/${{ github.head_ref }}?view=preview>"

build-docker:
name: build/docker
runs-on: ${{ matrix.os }}
# build-docker:
# name: build/docker
# runs-on: ${{ matrix.os }}

if: ${{ github.event_name == 'push' || github.event_name == 'pull_request' }}
# if: ${{ github.event_name == 'push' || github.event_name == 'pull_request' }}

strategy:
fail-fast: false
matrix:
os: [ubuntu-latest]
# strategy:
# fail-fast: false
# matrix:
# os: [ubuntu-latest]

steps:
- uses: actions/checkout@v2
- run: docker build -t docker.pkg.github.com/maputnik/editor/editor:master .
# steps:
# - uses: actions/checkout@v2
# - run: docker build -t docker.pkg.github.com/maputnik/editor/editor:master .

# build the editor
build-node:
Expand All @@ -61,10 +61,9 @@ jobs:
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
restore-keys: |
${{ runner.os }}-node-
- run: npm install
- run: npm ci
- run: npm run build


build-artifacts:
name: "build/artifacts (${{ matrix.os }})"
runs-on: ${{ matrix.os }}
Expand All @@ -91,7 +90,7 @@ jobs:
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
restore-keys: |
${{ runner.os }}-node-
- run: npm install
- run: npm ci
- run: npm run build
- run: npm run build-storybook
- name: artifacts/editor
Expand Down Expand Up @@ -146,8 +145,8 @@ jobs:
name: maputnik-windows
path: ./src/github.com/maputnik/desktop/bin/windows/

# build and test the editor
test_selenium_standalone:
# build and test the editor using Docker images
test_selenium_standalone_docker:
name: "test/standalone-${{ matrix.browser }} (${{ matrix.os }})"
runs-on: ${{ matrix.os }}

Expand All @@ -158,7 +157,7 @@ jobs:
matrix:
os: [ubuntu-latest]
node-version: [16]
browser: [chrome, firefox]
browser: [chrome, firefox, edge]

container:
image: node:${{ matrix.node-version }}
Expand All @@ -180,7 +179,7 @@ jobs:
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
restore-keys: |
${{ runner.os }}-node-
- run: npm install
- run: npm ci
- run: BROWSER=${{ matrix.browser }} TEST_NETWORK=testhost DOCKER_HOST=selenium npm run test
- if: ${{ matrix.browser == 'chrome' }}
run: ./node_modules/.bin/istanbul report --include build/coverage/coverage.json --dir build/coverage html lcov
Expand Down
28 changes: 14 additions & 14 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,21 +8,21 @@ on:
- 'v*'

jobs:
# publish docker to github registry
deploy-docker:
name: deploy/docker
runs-on: ${{ matrix.os }}
# # publish docker to github registry
# deploy-docker:
# name: deploy/docker
# runs-on: ${{ matrix.os }}

if: ${{ github.event_name == 'push' }}
# if: ${{ github.event_name == 'push' }}

strategy:
fail-fast: false
matrix:
os: [ubuntu-latest]
# strategy:
# fail-fast: false
# matrix:
# os: [ubuntu-latest]

steps:
- uses: actions/checkout@v2
- run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login docker.pkg.github.com -u orangemug --password-stdin
- run: docker build -t docker.pkg.github.com/maputnik/editor/editor:master .
- run: docker push docker.pkg.github.com/maputnik/editor/editor:master
# steps:
# - uses: actions/checkout@v2
# - run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login docker.pkg.github.com -u orangemug --password-stdin
# - run: docker build -t docker.pkg.github.com/maputnik/editor/editor:master .
# - run: docker push docker.pkg.github.com/maputnik/editor/editor:master

Loading