From 258cf8eb3aae3c8ed6690cc2d343587d9471dab1 Mon Sep 17 00:00:00 2001
From: Nicola Soranzo <nicola.soranzo@earlham.ac.uk>
Date: Fri, 22 Oct 2021 19:50:05 +0100
Subject: [PATCH] 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
---
 .github/workflows/first_startup.yaml        |  4 ++--
 .github/workflows/framework.yaml            |  3 +--
 .github/workflows/integration.yaml          |  8 ++++----
 .github/workflows/integration_selenium.yaml | 12 ++++++------
 .github/workflows/performance.yaml          |  4 ++--
 .github/workflows/selenium.yaml             | 12 ++++++------
 .github/workflows/toolshed.yaml             |  6 +++---
 7 files changed, 24 insertions(+), 25 deletions(-)

diff --git a/.github/workflows/first_startup.yaml b/.github/workflows/first_startup.yaml
index 999b9a799fd..06e9f8610f4 100644
--- a/.github/workflows/first_startup.yaml
+++ b/.github/workflows/first_startup.yaml
@@ -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:
diff --git a/.github/workflows/framework.yaml b/.github/workflows/framework.yaml
index dc3340ac1c7..b9f3c86c8ce 100644
--- a/.github/workflows/framework.yaml
+++ b/.github/workflows/framework.yaml
@@ -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
diff --git a/.github/workflows/integration.yaml b/.github/workflows/integration.yaml
index fc1dba19c51..671d90b9aec 100644
--- a/.github/workflows/integration.yaml
+++ b/.github/workflows/integration.yaml
@@ -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
diff --git a/.github/workflows/integration_selenium.yaml b/.github/workflows/integration_selenium.yaml
index f9e7d523b10..c8fd5e1980b 100644
--- a/.github/workflows/integration_selenium.yaml
+++ b/.github/workflows/integration_selenium.yaml
@@ -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
diff --git a/.github/workflows/performance.yaml b/.github/workflows/performance.yaml
index c7838d56217..3a610a284dc 100644
--- a/.github/workflows/performance.yaml
+++ b/.github/workflows/performance.yaml
@@ -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
diff --git a/.github/workflows/selenium.yaml b/.github/workflows/selenium.yaml
index dcf3b64873a..c72eab8431f 100644
--- a/.github/workflows/selenium.yaml
+++ b/.github/workflows/selenium.yaml
@@ -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
diff --git a/.github/workflows/toolshed.yaml b/.github/workflows/toolshed.yaml
index 4c4aec5efa3..58749619b49 100644
--- a/.github/workflows/toolshed.yaml
+++ b/.github/workflows/toolshed.yaml
@@ -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