Fix invalid framework GH workflow

Fix:
```
The workflow is not valid. .github/workflows/framework.yaml (Line: 8, Col: 1): 'env' is already defined
```

Also:
- consistently sort top-level `env` and `concurrency` (as in
  https://docs.github.com/en/actions/learn-github-actions/workflow-syntax-for-github-actions )
- sort env variables alphabetically
This commit is contained in:
Nicola Soranzo
2021-10-23 00:07:40 +01:00
parent 397a3a0543
commit 258cf8eb3a
7 changed files with 24 additions and 25 deletions
+2 -2
View File
@@ -1,10 +1,10 @@
name: first startup
on: [push, pull_request]
env:
YARN_INSTALL_OPTS: --frozen-lockfile
concurrency:
group: first-startup-${{ github.ref }}
cancel-in-progress: true
env:
YARN_INSTALL_OPTS: --frozen-lockfile
jobs:
test:
+1 -2
View File
@@ -1,12 +1,11 @@
name: Framework tests
on: [push, pull_request]
env:
GALAXY_TEST_DBURI: 'postgresql://postgres:postgres@localhost:5432/galaxy?client_encoding=utf8'
GALAXY_TEST_RAISE_EXCEPTION_ON_HISTORYLESS_HDA: '1'
concurrency:
group: framework-${{ github.ref }}
cancel-in-progress: true
env:
GALAXY_TEST_DBURI: 'postgresql://postgres:postgres@localhost:5432/galaxy?client_encoding=utf8'
jobs:
test:
name: Test
+4 -4
View File
@@ -1,12 +1,12 @@
name: Integration
on: [push, pull_request]
env:
GALAXY_TEST_AMQP_URL: 'amqp://localhost:5672//'
GALAXY_TEST_DBURI: 'postgresql://postgres:postgres@localhost:5432/galaxy?client_encoding=utf8'
GALAXY_TEST_RAISE_EXCEPTION_ON_HISTORYLESS_HDA: '1'
concurrency:
group: integration-${{ github.ref }}
cancel-in-progress: true
env:
GALAXY_TEST_DBURI: 'postgresql://postgres:postgres@localhost:5432/galaxy?client_encoding=utf8'
GALAXY_TEST_AMQP_URL: 'amqp://localhost:5672//'
GALAXY_TEST_RAISE_EXCEPTION_ON_HISTORYLESS_HDA: '1'
jobs:
test:
name: Test
+6 -6
View File
@@ -1,14 +1,14 @@
name: Integration Selenium
on: [push, pull_request]
env:
GALAXY_SKIP_CLIENT_BUILD: '0'
GALAXY_TEST_DBURI: 'postgresql://postgres:postgres@localhost:5432/galaxy?client_encoding=utf8'
GALAXY_TEST_RAISE_EXCEPTION_ON_HISTORYLESS_HDA: '1'
GALAXY_TEST_SELENIUM_RETRIES: 1
YARN_INSTALL_OPTS: --frozen-lockfile
concurrency:
group: integration-selenium-${{ github.ref }}
cancel-in-progress: true
env:
GALAXY_TEST_DBURI: 'postgresql://postgres:postgres@localhost:5432/galaxy?client_encoding=utf8'
GALAXY_SKIP_CLIENT_BUILD: '0'
GALAXY_TEST_SELENIUM_RETRIES: 1
YARN_INSTALL_OPTS: --frozen-lockfile
GALAXY_TEST_RAISE_EXCEPTION_ON_HISTORYLESS_HDA: '1'
jobs:
test:
name: Test
+2 -2
View File
@@ -1,10 +1,10 @@
name: Performance tests
on: [push, pull_request]
env:
GALAXY_TEST_DBURI: 'postgresql://postgres:postgres@localhost:5432/galaxy?client_encoding=utf8'
concurrency:
group: performance-${{ github.ref }}
cancel-in-progress: true
env:
GALAXY_TEST_DBURI: 'postgresql://postgres:postgres@localhost:5432/galaxy?client_encoding=utf8'
jobs:
test:
name: Test
+6 -6
View File
@@ -1,14 +1,14 @@
name: Selenium tests
on: [push, pull_request]
env:
GALAXY_TEST_DBURI: 'postgresql://postgres:postgres@localhost:5432/galaxy?client_encoding=utf8'
GALAXY_TEST_RAISE_EXCEPTION_ON_HISTORYLESS_HDA: '1'
GALAXY_TEST_SELENIUM_RETRIES: 1
GALAXY_TEST_SKIP_FLAKEY_TESTS_ON_ERROR: 'true'
YARN_INSTALL_OPTS: --frozen-lockfile
concurrency:
group: selenium-${{ github.ref }}
cancel-in-progress: true
env:
GALAXY_TEST_DBURI: 'postgresql://postgres:postgres@localhost:5432/galaxy?client_encoding=utf8'
GALAXY_TEST_SKIP_FLAKEY_TESTS_ON_ERROR: 'true'
GALAXY_TEST_SELENIUM_RETRIES: 1
YARN_INSTALL_OPTS: --frozen-lockfile
GALAXY_TEST_RAISE_EXCEPTION_ON_HISTORYLESS_HDA: '1'
jobs:
test:
name: Test
+3 -3
View File
@@ -1,11 +1,11 @@
name: Toolshed tests
on: [push, pull_request]
concurrency:
group: toolshed-${{ github.ref }}
cancel-in-progress: true
env:
GALAXY_TEST_DBURI: 'postgresql://postgres:postgres@localhost:5432/galaxy?client_encoding=utf8'
TOOL_SHED_TEST_DBURI: 'postgresql://postgres:postgres@localhost:5432/toolshed?client_encoding=utf8'
concurrency:
group: toolshed-${{ github.ref }}
cancel-in-progress: true
jobs:
test:
name: Test