Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix issues with CI tests #6586

Merged
merged 4 commits into from
Feb 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 13 additions & 13 deletions .github/workflows/abi.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,46 +38,46 @@ jobs:
run: python .github/gh_config_reader.py

abi_test:
name: ABI Test PG${{ matrix.test }}
name: ABI Test ${{ matrix.dir }} PG${{ matrix.pg }}
runs-on: ubuntu-latest
needs: config
strategy:
fail-fast: false
matrix:
test: [ "13backward", "13forward", "14backward", "14forward",
"15backward", "15forward", "16backward", "16forward" ]
dir: [ "forward", "backward" ]
pg: [ 13, 14, 15 ]
os: [ windows-2019 ]
include:
- test: 13backward
- dir: backward
pg: 13
builder: ${{ fromJson(needs.config.outputs.pg13_latest) }}-alpine3.18
tester: ${{ fromJson(needs.config.outputs.pg13_abi_min ) }}-alpine
- test: 13forward
- dir: forward
pg: 13
builder: ${{ fromJson(needs.config.outputs.pg13_abi_min ) }}-alpine
tester: ${{ fromJson(needs.config.outputs.pg13_latest) }}-alpine3.18
- test: 14backward
- dir: backward
pg: 14
builder: ${{ fromJson(needs.config.outputs.pg14_latest) }}-alpine3.18
tester: ${{ fromJson(needs.config.outputs.pg14_abi_min) }}-alpine
ignores: memoize
- test: 14forward
- dir: forward
pg: 14
builder: ${{ fromJson(needs.config.outputs.pg14_abi_min) }}-alpine
tester: ${{ fromJson(needs.config.outputs.pg14_latest) }}-alpine3.18
- test: 15backward
- dir: backward
pg: 15
builder: ${{ fromJson(needs.config.outputs.pg15_latest) }}-alpine3.18
tester: ${{ fromJson(needs.config.outputs.pg15_abi_min) }}-alpine
- test: 15forward
- dir: forward
pg: 15
builder: ${{ fromJson(needs.config.outputs.pg15_abi_min) }}-alpine
tester: ${{ fromJson(needs.config.outputs.pg15_latest) }}-alpine3.18
- test: 16backward
- dir: backward
pg: 16
builder: ${{ fromJson(needs.config.outputs.pg16_latest) }}-alpine3.18
tester: ${{ fromJson(needs.config.outputs.pg16_abi_min) }}-alpine
- test: 16forward
- dir: forward
pg: 16
builder: ${{ fromJson(needs.config.outputs.pg16_abi_min) }}-alpine
tester: ${{ fromJson(needs.config.outputs.pg16_latest) }}-alpine3.18
Expand Down Expand Up @@ -144,13 +144,13 @@ jobs:
if: always() && steps.collectlogs.outputs.regression_diff == 'true'
uses: actions/upload-artifact@v4
with:
name: Regression diff ABI Breakage ${{ matrix.type }} PG${{ matrix.pg }}
name: Regression diff ABI Breakage ${{ matrix.dir }} PG${{ matrix.pg }}
path: regression.log

- name: Save postmaster.log
if: always()
uses: actions/upload-artifact@v4
with:
name: PostgreSQL log ABI Breakage ${{ matrix.type }} PG${{ matrix.pg }}
name: PostgreSQL log ABI Breakage ${{ matrix.dir }} PG${{ matrix.pg }}
path: postgres.log

6 changes: 3 additions & 3 deletions .github/workflows/libfuzzer.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ jobs:

- name: Restore the cached fuzzing corpus (bulk)
id: restore-corpus-cache-bulk
uses: actions/cache/restore@v3
uses: actions/cache/restore@v4
with:
path: db/corpus-bulk
key: "${{ steps.config.outputs.cache_prefix }}-bulk"
Expand All @@ -182,7 +182,7 @@ jobs:
# they don't overwrite each other. Now we are going to combine them.
- name: Restore the cached fuzzing corpus (rowbyrow)
id: restore-corpus-cache-rowbyrow
uses: actions/cache/restore@v3
uses: actions/cache/restore@v4
with:
path: db/corpus-rowbyrow
key: "${{ steps.config.outputs.cache_prefix }}-rowbyrow"
Expand Down Expand Up @@ -325,7 +325,7 @@ jobs:

- name: Save fuzzer corpus
if: always()
uses: actions/cache/save@v3
uses: actions/cache/save@v4
with:
path: db/corpus-${{ matrix.case.bulk && 'bulk' || 'rowbyrow' }}
key: "${{ format('{0}-{1}-{2}-{3}',
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-handling.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
name: Assign PR to author
runs-on: ubuntu-latest
steps:
- uses: toshimaru/[email protected]
- uses: toshimaru/[email protected].0

ask-review:
name: Run pull-review
Expand Down
7 changes: 6 additions & 1 deletion .github/workflows/rpm-packages.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,14 @@ jobs:
image: [ "centos:centos7", "rockylinux:8", "rockylinux:9" ]
pg: [ 13, 14, 15, 16 ]
license: [ "TSL", "Apache"]
checkout: [ "v4" ]
include:
- license: Apache
pkg_suffix: "-oss"
# centos7 does not have the right versions to support
# node20. See https://github.com/actions/runner/issues/2906
- image: "centos:centos7"
checkout: "v3"
exclude:
# PG 16 is not available on centos7
- image: centos:centos7
Expand Down Expand Up @@ -72,7 +77,7 @@ jobs:
run: |
rpm -ql timescaledb-2${{ matrix.pkg_suffix }}-postgresql-${{ matrix.pg }}

- uses: actions/checkout@v4
- uses: actions/checkout@${{ matrix.checkout }}

- name: Read versions
id: versions
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/windows-build-and-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ jobs:
if: always() && steps.collectlogs.outputs.regression_diff == 'true'
uses: actions/upload-artifact@v4
with:
name: Regression diff ${{ matrix.os }} ${{ matrix.name }} ${{ matrix.pg }}
name: Regression ${{ matrix.pg }} diff ${{ matrix.os }} ${{ matrix.build_type }} Build
path: |
regression.log
installcheck.log
Expand All @@ -236,7 +236,7 @@ jobs:
if: always()
uses: actions/upload-artifact@v4
with:
name: PostgreSQL log ${{ matrix.os }} ${{ matrix.name }} ${{ matrix.pg }}
name: PostgreSQL ${{ matrix.pg }} log ${{ matrix.os }} ${{ matrix.build_type }} Build
path: postgres.log

- name: Upload test results to the database
Expand Down
Loading