diff --git a/.github/workflows/ci-bats-macos.yaml b/.github/workflows/ci-bats-macos.yaml index 667461a28b..bd1846fc58 100644 --- a/.github/workflows/ci-bats-macos.yaml +++ b/.github/workflows/ci-bats-macos.yaml @@ -94,7 +94,7 @@ jobs: run: | curl -OL https://github.com/apache/parquet-mr/archive/refs/tags/apache-parquet-1.12.3.tar.gz tar zxvf apache-parquet-1.12.3.tar.gz - cd parquet-mr-apache-parquet-1.12.3/parquet-cli + cd parquet-java-apache-parquet-1.12.3/parquet-cli mvn clean install -DskipTests runtime_jar="$(pwd)"/target/parquet-cli-1.12.3-runtime.jar echo "runtime_jar=$runtime_jar" >> $GITHUB_OUTPUT diff --git a/.github/workflows/doltgres-dependency.yml b/.github/workflows/doltgres-dependency.yml new file mode 100644 index 0000000000..b2bb57bb2f --- /dev/null +++ b/.github/workflows/doltgres-dependency.yml @@ -0,0 +1,47 @@ +name: Test Integration with DoltgreSQL +on: [pull_request] + +jobs: + test-integration: + runs-on: ubuntu-latest + + steps: + - name: Checkout go-mysql-server + uses: actions/checkout@v4 + with: + ref: ${{ github.event.pull_request.head.sha }} + + - name: Install Go + uses: actions/setup-go@v5 + with: + go-version-file: go/go.mod + + - name: Clone DoltgreSQL repository + run: git clone https://github.com/dolthub/doltgresql.git + + - name: Update DoltgreSQL's dependency + run: | + cd doltgresql + ./postgres/parser/build.sh + go get github.com/dolthub/dolt/go@${{ github.event.pull_request.head.sha }} + go get github.com/dolthub/dolt/go/gen/proto/dolt/services/eventsapi@${{ github.event.pull_request.head.sha }} + go mod tidy + + - name: Test DoltgreSQL + run: | + cd doltgresql/testing/go + go test ./... --count=1 -skip Replication || echo "doltgresql-tests-failed" > $GITHUB_WORKSPACE/doltgresql-test-result.txt + + - name: Comment on failures + if: always() + run: | + TEST_COMMENT="" + if [ -f $GITHUB_WORKSPACE/doltgresql-test-result.txt ]; then + TEST_COMMENT="Additional work is required for integration with [DoltgreSQL](https://github.com/dolthub/doltgresql)." + fi + if [ -n "$TEST_COMMENT" ]; then + curl -s -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" \ + -X POST \ + -d "{\"body\": \"$TEST_COMMENT\"}" \ + "https://api.github.com/repos/${{ github.repository }}/issues/${{ github.event.pull_request.number }}/comments" + fi diff --git a/go/cmd/dolt/doltversion/version.go b/go/cmd/dolt/doltversion/version.go index 0f000d303e..1a453e30a7 100644 --- a/go/cmd/dolt/doltversion/version.go +++ b/go/cmd/dolt/doltversion/version.go @@ -16,5 +16,5 @@ package doltversion const ( - Version = "1.39.0" + Version = "1.39.1" )