Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
89a9aa5
Add a script for installing all the software mentioned in the README
smklein Apr 1, 2022
147c97c
Update Readme
smklein Apr 1, 2022
0e5d984
Merge update and install
smklein Apr 3, 2022
6c01f56
Make DB downloads idempotent, contained in 'out/' directory
smklein Apr 3, 2022
876911f
Automate PATH verification, simplify README
smklein Apr 3, 2022
a80dd23
Patch paths in github action
smklein Apr 3, 2022
2626233
Merge branch 'better-db-install' into check-paths-too
smklein Apr 3, 2022
215fea3
stray newline
smklein Apr 3, 2022
866e016
Patch more PATH
smklein Apr 3, 2022
b6c70aa
Merge branch 'better-db-install' into check-paths-too
smklein Apr 3, 2022
40bdee8
Restore old formatting, xtrace
smklein Apr 4, 2022
c0be073
stray tab
smklein Apr 4, 2022
5644c46
Merge branch 'better-db-install' into check-paths-too
smklein Apr 4, 2022
a4ea71c
Add documentation, check clickhouse/cockroach in PATH
smklein Apr 4, 2022
54650f8
Merge branch 'main' into better-install
smklein Apr 4, 2022
3de53f1
More docs, hopefully more clear rc usage
smklein Apr 4, 2022
63e8e9a
Merge branch 'better-install' into better-db-install
smklein Apr 4, 2022
0c0cc8e
Merge branch 'better-db-install' into check-paths-too
smklein Apr 4, 2022
c20fec9
Testing use of in github action
smklein Apr 4, 2022
fd77f51
Idempotency message on error
smklein Apr 4, 2022
a3bf2b0
Merge branch 'better-install' into better-db-install
smklein Apr 4, 2022
bdfd478
Merge branch 'better-db-install' into check-paths-too
smklein Apr 4, 2022
809f5f8
Avoid using associative arrays. Macs have old bash
smklein Apr 4, 2022
0f7fd97
Merge branch 'check-paths-too' into github-test-install-script
smklein Apr 4, 2022
63488e8
use new helios
smklein Apr 4, 2022
60cbd71
Merge branch 'main' into check-paths-too
smklein Apr 8, 2022
067d2a5
Merge branch 'check-paths-too' into github-test-install-script
smklein May 3, 2022
7baaa5a
Merge branch 'main' into github-test-install-script
smklein May 3, 2022
69bd4ad
Try to pin helios?
smklein May 3, 2022
12afa75
YES + make mac work, maybe?
smklein May 3, 2022
278daea
Merge branch 'main' into github-test-install-script
smklein May 3, 2022
3c81ba0
use latest helios
smklein May 4, 2022
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
11 changes: 4 additions & 7 deletions .github/buildomat/jobs/build-and-test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#:
#: name = "helios / build-and-test"
#: variety = "basic"
#: target = "helios"
#: target = "helios-latest"
#: rust_toolchain = "nightly-2022-04-27"
#: output_rules = []
#:
Expand All @@ -14,12 +14,6 @@ set -o xtrace
cargo --version
rustc --version

banner clickhouse
ptime -m ./tools/ci_download_clickhouse

banner cockroach
ptime -m bash ./tools/ci_download_cockroachdb

#
# Set up a custom temporary directory within whatever one we were given so that
# we can check later whether we left detritus around.
Expand All @@ -34,6 +28,9 @@ mkdir $TEST_TMPDIR
#
export PATH="$PATH:$PWD/out/cockroachdb/bin:$PWD/out/clickhouse"

banner prerequisites
ptime -m bash ./tools/install_prerequisites.sh -y

#
# We build with:
#
Expand Down
30 changes: 6 additions & 24 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -102,26 +102,10 @@ jobs:

echo "Disk space:"
df -h
- name: Configure GitHub cache for CockroachDB binaries
id: cache-cockroachdb
# actions/cache@v2.1.4
uses: actions/cache@26968a09c0ea4f3e233fdddbafd1166051a095f6
with:
key: ${{ runner.os }}-cockroach-binary-${{ hashFiles('tools/cockroachdb_checksums') }}
path: "./out/cockroachdb"
- name: Configure GitHub cache for ClickHouse binaries
id: cache-clickhouse
# actions/cache@v2.1.4
uses: actions/cache@26968a09c0ea4f3e233fdddbafd1166051a095f6
with:
key: ${{ runner.os }}-clickhouse-binary-${{ hashFiles('tools/clickhouse_checksums') }}
path: "./out/clickhouse"
- name: Download ClickHouse
if: steps.cache-clickhouse.outputs.cache-hit != 'true'
run: ./tools/ci_download_clickhouse
- name: Download CockroachDB binary
if: steps.cache-cockroachdb.outputs.cache-hit != 'true'
run: bash ./tools/ci_download_cockroachdb
- name: Update PATH
run: echo "$PWD/out/cockroachdb/bin:$PWD/out/clickhouse" >> "$GITHUB_PATH"
- name: Install Pre-Requisites
run: ./tools/install_prerequisites.sh -y
- name: Create temporary directory for test outputs
run: mkdir -p $OMICRON_TMP
- name: Build
Expand All @@ -138,13 +122,11 @@ jobs:
# - TMPDIR=$OMICRON_TMP: we specify a specific temporary directory so that
# failed test outputs will be in a known place that we can grab at the
# end without also grabbing random other temporary files.
run: TMPDIR=$OMICRON_TMP PATH="$PATH:$PWD/out/cockroachdb/bin:$PWD/out/clickhouse" RUSTFLAGS="-D warnings" RUSTDOCFLAGS="-D warnings" cargo build --locked --all-targets --verbose
run: TMPDIR=$OMICRON_TMP RUSTFLAGS="-D warnings" RUSTDOCFLAGS="-D warnings" cargo build --locked --all-targets --verbose
- name: Run tests
# Use the same RUSTFLAGS and RUSTDOCFLAGS as above to avoid having to
# rebuild here.
# Put "./cockroachdb/bin" and "./clickhouse" on the PATH for the test
# suite.
run: TMPDIR=$OMICRON_TMP PATH="$PATH:$PWD/out/cockroachdb/bin:$PWD/out/clickhouse" RUSTFLAGS="-D warnings" RUSTDOCFLAGS="-D warnings" cargo test --no-fail-fast --workspace --locked --verbose
run: TMPDIR=$OMICRON_TMP RUSTFLAGS="-D warnings" RUSTDOCFLAGS="-D warnings" cargo test --no-fail-fast --workspace --locked --verbose
- name: Archive results left by tests
# actions/upload-artifact@v2.3.1
uses: actions/upload-artifact@82c141cc518b40d92cc801eee768e7aafc9c2fa2
Expand Down
11 changes: 10 additions & 1 deletion tools/ci_download_console
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,16 @@ function do_download_curl

function do_sha256sum
{
sha256sum < "$1" | awk '{print $1}'
case "$OSTYPE" in
darwin*)
SHA="shasum -a 256"
;;
*)
SHA="sha256sum"
;;
esac

$SHA < "$1" | awk '{print $1}'
}

function do_untar
Expand Down
1 change: 0 additions & 1 deletion tools/install_prerequisites.sh
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,6 @@ fi
./tools/ci_download_cockroachdb
./tools/ci_download_clickhouse


# Install static console assets. These are used when packaging Nexus.
./tools/ci_download_console

Expand Down