Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
73 changes: 10 additions & 63 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
pull_request: {}

env:
NODE_VERSION: 12
NODE_VERSION: 14

concurrency:
group: ci-${{ github.head_ref || github.ref }}
Expand All @@ -20,33 +20,17 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Install Node
uses: actions/setup-node@v2
uses: actions/setup-node@v3
with:
node-version: ${{ env.NODE_VERSION }}
cache: npm
- name: Install Dependencies
run: npm ci
run: bahmutov/npm-install@v1
- name: Lint
run: npm run lint
- name: Run Tests
run: npm run test:ember

floating:
name: 'Floating Dependencies'
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
with:
node-version: ${{ env.NODE_VERSION }}
cache: npm
- name: Install Dependencies
run: npm install --no-shrinkwrap
run: yarn lint
- name: Run Tests
run: npm run test:ember
run: yarn test

try-scenarios:
name: ${{ matrix.try-scenario }}
Expand All @@ -59,7 +43,6 @@ jobs:
try-scenario:
- ember-lts-3.24-leaflet-0.7.7
- ember-lts-3.24
- ember-lts-3.28
- ember-release
- ember-beta
- ember-canary
Expand All @@ -69,49 +52,13 @@ jobs:
- embroider-optimized

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Install Node
uses: actions/setup-node@v2
with:
node-version: ${{ env.NODE_VERSION }}
cache: npm
- name: Install Dependencies
run: npm ci
run: bahmutov/npm-install@v1
- name: Run Tests
run: ./node_modules/.bin/ember try:one ${{ matrix.try-scenario }}

deploy-app:
name: 'Deploy app'
runs-on: ubuntu-latest
needs: [test, floating, try-scenarios]
timeout-minutes: 7
# Only run on pushes to the default branch
if: github.event_name == 'push' && github.ref == 'refs/heads/master'
steps:
- name: Check out a copy of the repo
uses: actions/checkout@v2

- name: Set up Git user
run: |
# Set up a Git user for committing
git config --global user.name "GitHub Actions"
git config --global user.email "[email protected]"
# Copy the Git Auth from the local config
git config --global "http.https://github.com/.extraheader" \
"$(git config --local --get http.https://github.com/.extraheader)"
- name: Install Node
uses: actions/setup-node@v2
with:
node-version: ${{ env.NODE_VERSION }}
cache: npm

- name: Install Dependencies
run: npm ci
- name: Set ENV
# 'master' or 'v1.2.3'
# https://github.com/ember-learn/ember-cli-addon-docs/issues/454#issuecomment-584129324
# https://github.com/ember-learn/ember-cli-addon-docs/issues/437
run: echo "ADDON_DOCS_VERSION_PATH=${GITHUB_REF##*/}" >> $GITHUB_ENV

- name: Deploy
run: npm run-script deploy
run: yarn ember try:one ${{ matrix.try-scenario }}
working-directory: packages/test-app
6 changes: 1 addition & 5 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@

# See https://help.github.com/ignore-files/ for more about ignoring files.

# compiled output
/dist/
/tmp/

# dependencies
/bower_components/
/node_modules/

# misc
Expand All @@ -24,8 +23,5 @@

# ember-try
/.node_modules.ember-try/
/bower.json.ember-try
/npm-shrinkwrap.json.ember-try
/package.json.ember-try
/package-lock.json.ember-try
/yarn.lock.ember-try
41 changes: 0 additions & 41 deletions .npmignore

This file was deleted.

26 changes: 0 additions & 26 deletions addon/index.js

This file was deleted.

1 change: 0 additions & 1 deletion app/components/array-path-layer.js

This file was deleted.

1 change: 0 additions & 1 deletion app/components/base-layer.js

This file was deleted.

1 change: 0 additions & 1 deletion app/components/circle-layer.js

This file was deleted.

1 change: 0 additions & 1 deletion app/components/circle-marker-layer.js

This file was deleted.

1 change: 0 additions & 1 deletion app/components/div-overlay-layer.js

This file was deleted.

1 change: 0 additions & 1 deletion app/components/geojson-layer.js

This file was deleted.

1 change: 0 additions & 1 deletion app/components/image-layer.js

This file was deleted.

1 change: 0 additions & 1 deletion app/components/interactive-layer.js

This file was deleted.

1 change: 0 additions & 1 deletion app/components/leaflet-map.js

This file was deleted.

1 change: 0 additions & 1 deletion app/components/marker-layer.js

This file was deleted.

1 change: 0 additions & 1 deletion app/components/path-layer.js

This file was deleted.

1 change: 0 additions & 1 deletion app/components/point-path-layer.js

This file was deleted.

1 change: 0 additions & 1 deletion app/components/polygon-layer.js

This file was deleted.

1 change: 0 additions & 1 deletion app/components/polyline-layer.js

This file was deleted.

1 change: 0 additions & 1 deletion app/components/popup-layer.js

This file was deleted.

1 change: 0 additions & 1 deletion app/components/rectangle-layer.js

This file was deleted.

1 change: 0 additions & 1 deletion app/components/tile-layer.js

This file was deleted.

1 change: 0 additions & 1 deletion app/components/tooltip-layer.js

This file was deleted.

1 change: 0 additions & 1 deletion app/components/video-layer.js

This file was deleted.

1 change: 0 additions & 1 deletion app/components/wms-tile-layer.js

This file was deleted.

1 change: 0 additions & 1 deletion app/helpers/div-icon.js

This file was deleted.

1 change: 0 additions & 1 deletion app/helpers/ember-leaflet-assign-to.js

This file was deleted.

1 change: 0 additions & 1 deletion app/helpers/ember-leaflet-eq.js

This file was deleted.

1 change: 0 additions & 1 deletion app/helpers/ember-leaflet-hash.js

This file was deleted.

1 change: 0 additions & 1 deletion app/helpers/ember-leaflet-or.js

This file was deleted.

1 change: 0 additions & 1 deletion app/helpers/icon.js

This file was deleted.

1 change: 0 additions & 1 deletion app/helpers/lat-lng-bounds.js

This file was deleted.

1 change: 0 additions & 1 deletion app/helpers/point.js

This file was deleted.

1 change: 0 additions & 1 deletion app/initializers/leaflet-assets.js

This file was deleted.

1 change: 0 additions & 1 deletion app/services/ember-leaflet.js

This file was deleted.

13 changes: 0 additions & 13 deletions blueprints/ember-leaflet/index.js

This file was deleted.

9 changes: 0 additions & 9 deletions config/addon-docs.js

This file was deleted.

34 changes: 0 additions & 34 deletions config/deploy.js

This file was deleted.

Loading