Skip to content

Commit

Permalink
fix: integration tests (hopefully)
Browse files Browse the repository at this point in the history
  • Loading branch information
alecthomas committed Aug 6, 2023
1 parent 554bd9b commit da60bb9
Show file tree
Hide file tree
Showing 6 changed files with 41 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ jobs:
run: shellcheck -e SC2016 scripts/*
integration:
name: Integration tests
if: startsWith(github.ref, 'refs/heads/gh-readonly-queue/') || github.ref == 'refs/heads/main'
# if: startsWith(github.ref, 'refs/heads/gh-readonly-queue/') || github.ref == 'refs/heads/main'
runs-on: ubuntu-latest
steps:
- name: Checkout code
Expand Down
1 change: 1 addition & 0 deletions bin/.ktfmt-0.44.pkg
1 change: 1 addition & 0 deletions bin/ktfmt
32 changes: 32 additions & 0 deletions bin/packages/ktfmt.hcl
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
description = "ktfmt is a program that pretty-prints (formats) Kotlin code, based on google-java-format."
binaries = ["ktfmt"]
source = "https://repo1.maven.org/maven2/com/facebook/ktfmt/${version}/ktfmt-${version}-jar-with-dependencies.jar"
dont-extract = true

on "unpack" {
rename {
from = "${root}/ktfmt-${version}-jar-with-dependencies.jar"
to = "${root}/ktfmt.jar"
}

copy {
from = "ktfmt/ktfmt.sh"
to = "${root}/ktfmt"
mode = 448
}
}

version "0.41" "0.40" "0.39" "0.42" "0.43" "0.44" {
auto-version {
github-release = "facebook/ktfmt"
}
}

sha256sums = {
"https://repo1.maven.org/maven2/com/facebook/ktfmt/0.39/ktfmt-0.39-jar-with-dependencies.jar": "72bd918f3e36c18561eefa7eba08221ae80086deccbaf81305710ec421041d8d",
"https://repo1.maven.org/maven2/com/facebook/ktfmt/0.40/ktfmt-0.40-jar-with-dependencies.jar": "d6ba1dc635b30dfab0203555d4ebcade78d537cb550402c820c44be43f64c8dd",
"https://repo1.maven.org/maven2/com/facebook/ktfmt/0.41/ktfmt-0.41-jar-with-dependencies.jar": "a763c2b24a7dfe3f270ebe652938cf76b1a13fec98b97589f2f788bd152a72d7",
"https://repo1.maven.org/maven2/com/facebook/ktfmt/0.42/ktfmt-0.42-jar-with-dependencies.jar": "67901bf2b267750f55422c2ce706224741000cf401f2f202d7070afd4d697a4d",
"https://repo1.maven.org/maven2/com/facebook/ktfmt/0.43/ktfmt-0.43-jar-with-dependencies.jar": "ed79f177ac714cf6cf7be4730a2ed061562f02bdb42bbf4bfa9ef2226d82ca45",
"https://repo1.maven.org/maven2/com/facebook/ktfmt/0.44/ktfmt-0.44-jar-with-dependencies.jar": "1d1823ea8943449e8205374fa5e458d9e665e14e4e19c949633f8e94439f919e",
}
4 changes: 4 additions & 0 deletions bin/packages/ktfmt/ktfmt.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#!/bin/bash

KTFMT_DIR="$(dirname "${BASH_SOURCE[0]:-${(%):-%x}}")"
exec java --add-opens java.base/java.lang=ALL-UNNAMED -Xmx512m -jar "${KTFMT_DIR}/ktfmt.jar" "$@"
4 changes: 2 additions & 2 deletions scripts/integration-tests
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ wait_for() {

start_cluster() {
info "Starting cluster"
overmind start -D
overmind echo &
overmind start &
sleep 60
wait_for "cluster to become ready" "ftl status"
trap "overmind quit" EXIT INT TERM
}
Expand Down

0 comments on commit da60bb9

Please sign in to comment.