Skip to content

Commit 5579886

Browse files
committed
Merge branch '6.0' into 6.0-gt-actions-preparation
2 parents 30836be + 3644a2a commit 5579886

File tree

2 files changed

+1
-26
lines changed

2 files changed

+1
-26
lines changed

.github/actions/setup-dotnets/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,4 +51,4 @@ runs:
5151
if: ${{ contains(inputs.target_framework, '2.0') }}
5252
uses: actions/setup-dotnet@v4
5353
with:
54-
dotnet-version: '2.1.403'
54+
dotnet-version: '2.0.x'

.github/workflows/dispatched-pgsql9-tests.yml

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,6 @@ on:
2121
pgsql92:
2222
description: 'PostgreSQL 9.2'
2323
type: boolean
24-
default: false
25-
required: true
26-
pgsql96:
27-
description: 'PostgreSQL 9.6'
28-
type: boolean
2924
default: true
3025
required: true
3126

@@ -97,23 +92,3 @@ jobs:
9792
run_sql: true
9893
run_extensions: true
9994
publish_raw_results: true
100-
101-
test_on_pgsql96:
102-
name: Tests on PostgreSQL 9.6
103-
if: ${{ inputs.pgsql96 }}
104-
strategy:
105-
matrix:
106-
net: [ 'netcoreapp2.0' ]
107-
uses: DataObjects-NET/dataobjects-net/.github/workflows/reusable-storage-dependant-tests.yml@6.0
108-
with:
109-
storage: pgsql96
110-
build_config: Release
111-
target_framework: ${{ matrix.net }}
112-
specific_sha: ${{ inputs.specific_sha }}
113-
fetch_depth: ${{ fromJSON(inputs.fetch_depth) }}
114-
test_output_verbosity: minimal
115-
test_run_timeout: 30
116-
run_main: true
117-
run_sql: true
118-
run_extensions: true
119-
publish_raw_results: true

0 commit comments

Comments
 (0)