Skip to content

Commit

Permalink
Merge branch 'release-2.27' into backport/pr-5434-to-release-2.27
Browse files Browse the repository at this point in the history
  • Loading branch information
ihnorton authored Feb 4, 2025
2 parents df58d6b + 692764a commit 309cf64
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 15 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-rtools40.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ jobs:
VCPKG_ROOT: ${{ github.workspace }}/vcpkg
shell: c:\rtools40\usr\bin\bash.exe --login {0}
- name: "Upload binaries"
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: mingw-w64-${{ matrix.msystem }}-tiledb
path: .github/workflows/mingw-w64-tiledb/*.pkg.tar.*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
# Save the tiledb_unit binary for use in the next step
- name: 'Upload Artifact'
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: tiledb_unit
path: ${{ github.workspace }}/build/test/tiledb_unit
Expand All @@ -66,7 +66,7 @@ jobs:
- uses: actions/checkout@v3

- name: Download a single artifact
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: tiledb_unit
path: ${{ github.workspace }}/build/test/
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -406,7 +406,7 @@ jobs:
- name: 'upload dumpfile artifacts' # https://github.com/actions/upload-artifact#where-does-the-upload-go
if: ${{ always() == true && startsWith(matrix.os, 'windows-') == true }} # only run this job if the build step failed
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
retention-days: 10
name: "coredumps.${{ github.job }}.${{ matrix.os }}.${{matrix.environ}}.${{ github.run_number }}.${{github.run_id}}.${{github.run_attempt}}"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci-linux_mac.yml
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ jobs:

- name: 'Upload failure artifacts (Linux)' # https://github.com/actions/upload-artifact#where-does-the-upload-go
if: ${{ startsWith(matrix.os, 'ubuntu-') == true }} # only run this job if the build step failed
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
retention-days: 10
name: "coredumps.${{ github.job }}.${{ matrix.os }}.${{ github.run_number }}.${{github.run_id}}.${{github.run_attempt}}"
Expand All @@ -255,7 +255,7 @@ jobs:
- name: 'Upload failure artifacts (macOS)' # https://github.com/actions/upload-artifact#where-does-the-upload-go
if: ${{ failure() == true && startsWith(matrix.os, 'macos-') == true }} # only run this job if the build step failed
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
retention-days: 10
name: "${{ matrix.os }}.coredumps.${{ github.job }}.${{ github.run_number }}.${{github.run_id}}.${{github.run_attempt}}"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/nightly-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -147,4 +147,4 @@ jobs:
with:
name: nightly GitHub Actions build
label: nightly
assignee: KiterLuc,teo-tsirpanis,davisp
assignee: davisp,dudoslav,ihnorton,teo-tsirpanis
18 changes: 10 additions & 8 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
TILEDB_PACKAGE_VERSION: ${{ steps.get-values.outputs.release_version }}
run: cd build && cpack --config CPackSourceConfig.cmake
- name: Upload Release Artifacts
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: release
path: |
Expand Down Expand Up @@ -150,9 +150,9 @@ jobs:
TILEDB_PACKAGE_VERSION: ${{ steps.get-values.outputs.release_version }}
run: cmake --build build -j4 --config Release --target package
- name: Upload release artifacts
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: release
name: release-${{ matrix.platform }}
path: |
build/tiledb-*.tar.gz*
build/tiledb-*.zip*
Expand All @@ -168,9 +168,10 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Download release artifacts
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: release
pattern: release-*
merge-multiple: true
path: dist
- name: Test names of release artifacts
run: |
Expand All @@ -187,9 +188,10 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Download release artifacts
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: release
name: release-*
merge-multiple: true
path: dist
- name: Publish release artifacts
uses: actions/github-script@v6
Expand Down Expand Up @@ -240,4 +242,4 @@ jobs:
with:
name: Release failed
label: release
assignee: KiterLuc,teo-tsirpanis,davisp
assignee: davisp,dudoslav,ihnorton,teo-tsirpanis

0 comments on commit 309cf64

Please sign in to comment.