Merge pull request #300 from TileDB-Inc/phw/simplify-workflow

Simplify workflow.
TileDB-Inc · Mar 21, 2024 · 61edd69 · 61edd69
2 parents 58ea69a + 3bdbd24
commit 61edd69
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 12 deletions.
diff --git a/.github/scripts/install_tiledb_linux.sh b/.github/scripts/install_tiledb_linux.sh
@@ -1,5 +1,4 @@
 set -e -x
-source "$(dirname $0)/tiledb-version.sh"
-curl --location -o tiledb.tar.gz https://github.com/TileDB-Inc/TileDB/releases/download/${TILEDB_VERSION}/tiledb-linux-x86_64-${TILEDB_VERSION}-${COMMIT_ID}.tar.gz \
+curl --location -o tiledb.tar.gz https://github.com/TileDB-Inc/TileDB/releases/download/${CORE_VERSION}/tiledb-linux-x86_64-${CORE_VERSION}-${CORE_HASH}.tar.gz \
 && sudo tar -C /usr/local -xf tiledb.tar.gz
 sudo ldconfig /usr/local/lib
diff --git a/.github/scripts/install_tiledb_linux_debug.sh b/.github/scripts/install_tiledb_linux_debug.sh
@@ -1,6 +1,5 @@
 set -e -x
-source "$(dirname $0)/tiledb-version.sh"
-git clone https://github.com/TileDB-Inc/TileDB.git -b ${TILEDB_VERSION}
+git clone https://github.com/TileDB-Inc/TileDB.git -b ${CORE_VERSION}
 cd TileDB
 mkdir build && cd build
 cmake -DTILEDB_WERROR=OFF -DTILEDB_VCPKG=ON -DSANITIZER=leak -DTILEDB_VERBOSE=OFF -DTILEDB_S3=ON -DTILEDB_SERIALIZATION=ON -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=/usr/local ..

diff --git a/.github/scripts/install_tiledb_macos.sh b/.github/scripts/install_tiledb_macos.sh
@@ -1,4 +1,3 @@
 set -e -x
-source "$(dirname $0)/tiledb-version.sh"
-curl --location -o tiledb.tar.gz https://github.com/TileDB-Inc/TileDB/releases/download/${TILEDB_VERSION}/tiledb-macos-x86_64-${TILEDB_VERSION}-${COMMIT_ID}.tar.gz \
+curl --location -o tiledb.tar.gz https://github.com/TileDB-Inc/TileDB/releases/download/${CORE_VERSION}/tiledb-macos-x86_64-${CORE_VERSION}-${CORE_HASH}.tar.gz \
 && sudo tar -C /usr/local -xSf tiledb.tar.gz
diff --git a/.github/scripts/install_tiledb_source_linux.sh b/.github/scripts/install_tiledb_source_linux.sh
@@ -1,6 +1,5 @@
 set -e -x
-source "$(dirname $0)/tiledb-version.sh"
-git clone https://github.com/TileDB-Inc/TileDB.git -b ${TILEDB_VERSION}
+git clone https://github.com/TileDB-Inc/TileDB.git -b ${CORE_VERSION}
 cd TileDB
 mkdir build && cd build
 cmake -DTILEDB_WERROR=OFF -DTILEDB_VCPKG=ON -DTILEDB_VERBOSE=OFF -DTILEDB_S3=ON -DTILEDB_SERIALIZATION=ON -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr/local ..

diff --git a/.github/scripts/install_tiledb_source_macos.sh b/.github/scripts/install_tiledb_source_macos.sh
@@ -1,6 +1,5 @@
 set -e -x
-source "$(dirname $0)/tiledb-version.sh"
-git clone https://github.com/TileDB-Inc/TileDB.git -b ${TILEDB_VERSION}
+git clone https://github.com/TileDB-Inc/TileDB.git -b ${CORE_VERSION}
 cd TileDB
 mkdir build && cd build
 cmake -DTILEDB_WERROR=OFF -DTILEDB_VCPKG=ON -DTILEDB_VERBOSE=OFF -DTILEDB_S3=ON -DTILEDB_SERIALIZATION=ON -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr/local ..

diff --git a/.github/scripts/tiledb-version.sh b/.github/scripts/tiledb-version.sh
diff --git a/.github/workflows/tiledb-go.yml b/.github/workflows/tiledb-go.yml
@@ -7,6 +7,12 @@ on:
   pull_request:
     branches: [ master ]
 
+env:
+  # The version of TileDB to test against.
+  CORE_VERSION: "2.20.1"
+  # The abbreviated git commit hash to use.
+  CORE_HASH: "249c024"
+
 jobs:
   golangci:
     name: lint