Skip to content

Commit 183e9ab

Browse files
committed
Merge branch 'master' into qgis-security-scan
2 parents c238131 + 661f72c commit 183e9ab

File tree

6 files changed

+327
-231
lines changed

6 files changed

+327
-231
lines changed

.github/workflows/autotests.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,6 @@ name: Auto Tests
22
on: [push]
33
env:
44
TEST_MERGIN_URL: https://app.dev.merginmaps.com/
5-
TEST_API_USERNAME: test_plugin
6-
TEST_API_PASSWORD: ${{ secrets.MERGINTEST_API_PASSWORD }}
7-
TEST_API_USERNAME2: test_plugin2
8-
TEST_API_PASSWORD2: ${{ secrets.MERGINTEST_API_PASSWORD2 }}
95

106
concurrency:
117
group: ci-${{github.ref}}-autotests
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
name: Notify releases repo
2+
3+
on:
4+
milestone:
5+
types: [created, edited]
6+
7+
jobs:
8+
notify:
9+
runs-on: ubuntu-latest
10+
steps:
11+
- name: Dispatch to releases repo
12+
env:
13+
GH_TOKEN: ${{ secrets.MM_RELEASES_SYNC_TOKEN }}
14+
run: |
15+
gh api repos/MerginMaps/releases/dispatches \
16+
--method POST \
17+
-f event_type=milestone-${{ github.event.action }} \
18+
-f 'client_payload[repo]=${{ github.repository }}' \
19+
-f 'client_payload[milestone_title]=${{ github.event.milestone.title }}' \
20+
-f 'client_payload[milestone_url]=${{ github.event.milestone.html_url }}'

README.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -183,13 +183,12 @@ For running test do:
183183

184184
```bash
185185
cd mergin
186+
# TEST_ related vairables are optional
186187
export TEST_MERGIN_URL=<url> # testing server
187188
export TEST_API_USERNAME=<username>
188189
export TEST_API_PASSWORD=<pwd>
189190
export TEST_API_USERNAME2=<username2>
190191
export TEST_API_PASSWORD2=<pwd2>
191-
# workspace name with controlled available storage space (e.g. 20MB), default value: testpluginstorage
192-
export TEST_STORAGE_WORKSPACE=<workspacename>
193192
pip install pytest pytest-cov coveralls
194193
pytest --cov-report html --cov=mergin mergin/test/
195194
```

0 commit comments

Comments
 (0)