Merge pull request #589 from bernt-matthias/topic/syncci-21.05

sync with IUC CI and use 21.05
galaxyproteomics · May 6, 2021 · 888b3e9 · 888b3e9
2 parents 0e9a3af + 2f5040d
commit 888b3e9
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 14 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -7,7 +7,7 @@ on:
     types: [run-all-tool-tests-command]
 env:
   GALAXY_FORK: galaxyproject
-  GALAXY_BRANCH: release_21.01
+  GALAXY_BRANCH: release_21.05
   MAX_CHUNKS: 40
 jobs:
   setup:
@@ -23,7 +23,7 @@ jobs:
       chunk-list: ${{ steps.discover.outputs.chunk-list }}
     strategy:
       matrix:
-        python-version: [3.7]
+        python-version: ['3.7']
     steps:
     - name: Add reaction
       if: ${{ github.event.client_payload.slash_command.command == 'run-all-tool-tests' }}
@@ -84,7 +84,7 @@ jobs:
       fail-fast: false
       matrix:
         chunk: ${{ fromJson(needs.setup.outputs.chunk-list) }}
-        python-version: [3.7]
+        python-version: ['3.7']
     services:
       postgres:
         image: postgres:11
@@ -148,7 +148,7 @@ jobs:
     needs: [setup, test]
     strategy:
       matrix:
-        python-version: [3.7]
+        python-version: ['3.7']
     # This job runs on Linux
     runs-on: ubuntu-latest
     steps:

diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml
@@ -2,7 +2,7 @@ name: Galaxy Tool Linting and Tests for push and PR
 on: [push, pull_request]
 env:
   GALAXY_FORK: galaxyproject
-  GALAXY_BRANCH: release_21.01
+  GALAXY_BRANCH: release_21.05
   MAX_CHUNKS: 4
 jobs:
   # the setup job does two things:
@@ -23,7 +23,7 @@ jobs:
       chunk-list: ${{ steps.discover.outputs.chunk-list }}
     strategy:
       matrix:
-        python-version: [3.7]
+        python-version: ['3.7']
     steps:
     - name: Print github context properties
       run: |
@@ -89,7 +89,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: [3.7]
+        python-version: ['3.7']
     steps:
     # checkout the repository
     # and use it as the current working directory
@@ -122,7 +122,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: [3.7]
+        python-version: ['3.7']
     steps:
     # checkout the repository to master
     # and use it as the current working directory
@@ -147,10 +147,11 @@ jobs:
     name: Lint R scripts
     needs: setup
     if: needs.setup.outputs.repository-list != ''
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        r-version: [4.0.1]
+        os: [ubuntu-20.04]
+        r-version: ['4.0.1']
     steps:
     # checkout the repository to master
     # and use it as the current working directory
@@ -164,7 +165,7 @@ jobs:
       uses: actions/cache@v2
       with:
         path: ${{ env.R_LIBS_USER }}
-        key: r_cache_${{ matrix.r-version }}
+        key: r_cache_${{ matrix.os }}_${{ matrix.r-version }}
     - name: Install non-R lintr dependencies
       run: sudo apt-get install libcurl4-openssl-dev
     - name: Install lintr
@@ -209,7 +210,7 @@ jobs:
       fail-fast: false
       matrix:
         chunk: ${{ fromJson(needs.setup.outputs.chunk-list) }}
-        python-version: [3.7]
+        python-version: ['3.7']
     services:
       postgres:
         image: postgres:11
@@ -279,7 +280,7 @@ jobs:
     needs: [setup, test]
     strategy:
       matrix:
-        python-version: [3.7]
+        python-version: ['3.7']
     # This job runs on Linux
     runs-on: ubuntu-latest
     steps:
@@ -317,7 +318,7 @@ jobs:
     needs: [setup, lint, flake8, lintr, combine_outputs]
     strategy:
       matrix:
-        python-version: [3.7]
+        python-version: ['3.7']
     runs-on: ubuntu-latest
     if: github.ref == 'refs/heads/master' && github.repository_owner == 'galaxyproteomics'
     steps: