Skip to content

Commit b48907f

Browse files
Merge branch 'dev' into collections-in-dataset-names
2 parents 6e2e64c + baf4f19 commit b48907f

File tree

1,750 files changed

+43461
-60817
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,750 files changed

+43461
-60817
lines changed

.github/workflows/api.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
chunk: [0, 1]
3636
services:
3737
postgres:
38-
image: postgres:13
38+
image: postgres:17
3939
env:
4040
POSTGRES_USER: postgres
4141
POSTGRES_PASSWORD: postgres

.github/workflows/bioblend.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
runs-on: ubuntu-latest
1717
services:
1818
postgres:
19-
image: postgres
19+
image: postgres:17
2020
# Provide the password for postgres
2121
env:
2222
POSTGRES_PASSWORD: postgres

.github/workflows/check_test_class_names.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,6 @@ jobs:
2525
cache: 'pip'
2626
cache-dependency-path: 'requirements.txt'
2727
- name: Install Python dependencies
28-
run: pip install -r requirements.txt -r lib/galaxy/dependencies/dev-requirements.txt
28+
run: pip install -r requirements.txt -r lib/galaxy/dependencies/pinned-test-requirements.txt
2929
- name: Run tests
3030
run: .ci/check_test_class_names.sh

.github/workflows/cwl_conformance.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
conformance-version: ['cwl_conformance_v1_0'] #, 'cwl_conformance_v1_1', 'cwl_conformance_v1_2']
3232
services:
3333
postgres:
34-
image: postgres:13
34+
image: postgres:17
3535
env:
3636
POSTGRES_USER: postgres
3737
POSTGRES_PASSWORD: postgres

.github/workflows/db_indexes.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
strategy:
2626
matrix:
2727
db: ['postgresql', 'sqlite']
28-
postgresql-version: ['13']
28+
postgresql-version: ['17']
2929
python-version: ['3.9']
3030
include:
3131
- db: postgresql

.github/workflows/framework_tools.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
python-version: ['3.9']
3131
services:
3232
postgres:
33-
image: postgres:13
33+
image: postgres:17
3434
env:
3535
POSTGRES_USER: postgres
3636
POSTGRES_PASSWORD: postgres

.github/workflows/framework_workflows.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
python-version: ['3.9']
3030
services:
3131
postgres:
32-
image: postgres:13
32+
image: postgres:17
3333
env:
3434
POSTGRES_USER: postgres
3535
POSTGRES_PASSWORD: postgres

.github/workflows/integration.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
chunk: ['0', '1', '2', '3']
3636
services:
3737
postgres:
38-
image: postgres:13
38+
image: postgres:17
3939
env:
4040
POSTGRES_USER: postgres
4141
POSTGRES_PASSWORD: postgres

.github/workflows/integration_selenium.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
python-version: ['3.9']
3737
services:
3838
postgres:
39-
image: postgres:13
39+
image: postgres:17
4040
env:
4141
POSTGRES_USER: postgres
4242
POSTGRES_PASSWORD: postgres

.github/workflows/js_lint.yaml

Lines changed: 2 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -35,45 +35,6 @@ jobs:
3535
- name: Run prettier checks
3636
run: yarn run format-check
3737
working-directory: client
38-
# Run vue-tsc, compare with base, only fail if errors increased.
39-
- name: Run vue-tsc on PR
40-
id: current
38+
- name: Run vue-tsc
4139
working-directory: client
42-
run: |
43-
# Run vue-tsc in a simulated TTY to capture the summary output.
44-
script -q -c 'npx vue-tsc --noEmit' current.log
45-
# Extract the error count from the summary line; default to 0 if not found.
46-
CURRENT_ERRORS=$(grep -oE 'Found [0-9]+ errors' current.log | head -1 | grep -oE '[0-9]+' || echo 0)
47-
echo "Current vue-tsc errors: $CURRENT_ERRORS"
48-
echo "current_errors=$CURRENT_ERRORS" >> $GITHUB_OUTPUT
49-
# Check out the target base branch into a separate directory called "base".
50-
- name: Checkout target base branch
51-
uses: actions/checkout@v4
52-
with:
53-
ref: ${{ github.event.pull_request.base.ref }}
54-
- run: yarn install --frozen-lockfile
55-
working-directory: client
56-
# Run vue-tsc on the base branch and capture its error count.
57-
- name: Run vue-tsc on base branch
58-
id: baseline
59-
working-directory: client
60-
run: |
61-
# Run vue-tsc in a simulated TTY and save the output to baseline.log.
62-
script -q -c 'npx vue-tsc --noEmit' baseline.log
63-
# Extract the error count from the summary line; default to 0 if not found.
64-
BASE_ERRORS=$(grep -oE 'Found [0-9]+ errors' baseline.log | head -1 | grep -oE '[0-9]+' || echo 0)
65-
echo "Baseline vue-tsc errors: $BASE_ERRORS"
66-
echo "baseline_errors=$BASE_ERRORS" >> $GITHUB_OUTPUT
67-
# Compare the error counts between the PR branch and the base branch.
68-
- name: Compare vue-tsc error counts
69-
run: |
70-
CURRENT=${{ steps.current.outputs.current_errors }}
71-
BASE=${{ steps.baseline.outputs.baseline_errors }}
72-
echo "Current errors: ${CURRENT}"
73-
echo "Baseline errors: ${BASE}"
74-
if [ "$CURRENT" -gt "$BASE" ]; then
75-
echo "vue-tsc error count increased from ${BASE} to ${CURRENT}. Failing the build."
76-
exit 1
77-
else
78-
echo "vue-tsc error count did not increase."
79-
fi
40+
run: npx vue-tsc --noEmit

0 commit comments

Comments
 (0)