Skip to content

update maven for ORM tests #9244

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jennifersp merged 1 commit into from
May 23, 2025
Merged

update maven for ORM tests #9244

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions .github/workflows/ci-bats-macos.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,9 +85,9 @@ jobs:
- name: Install Maven
working-directory: ./.ci_bin
run: |
curl -LO https://dlcdn.apache.org/maven/maven-3/3.9.4/binaries/apache-maven-3.9.4-bin.tar.gz
tar -xf apache-maven-3.9.4-bin.tar.gz
echo "$(pwd)/apache-maven-3.9.4/bin" >> $GITHUB_PATH
curl -LO https://dlcdn.apache.org/maven/maven-3/3.9.9/binaries/apache-maven-3.9.9-bin.tar.gz
tar -xf apache-maven-3.9.9-bin.tar.gz
echo "$(pwd)/apache-maven-3.9.9/bin" >> $GITHUB_PATH
- name: Install Hadoop
working-directory: ./.ci_bin
run: |
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/ci-bats-unix-remote.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,9 @@ jobs:
if: ${{ env.use_credentials != 'true' }}
working-directory: ./.ci_bin
run: |
curl -LO https://dlcdn.apache.org/maven/maven-3/3.9.4/binaries/apache-maven-3.9.4-bin.tar.gz
tar -xf apache-maven-3.9.4-bin.tar.gz
echo "$(pwd)/apache-maven-3.9.4/bin" >> $GITHUB_PATH
curl -LO https://dlcdn.apache.org/maven/maven-3/3.9.9/binaries/apache-maven-3.9.9-bin.tar.gz
tar -xf apache-maven-3.9.9-bin.tar.gz
echo "$(pwd)/apache-maven-3.9.9/bin" >> $GITHUB_PATH
- name: Install Hadoop
if: ${{ env.use_credentials != 'true' }}
working-directory: ./.ci_bin
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/ci-bats-unix.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,9 +91,9 @@ jobs:
- name: Install Maven
working-directory: ./.ci_bin
run: |
curl -LO https://dlcdn.apache.org/maven/maven-3/3.9.4/binaries/apache-maven-3.9.4-bin.tar.gz
tar -xf apache-maven-3.9.4-bin.tar.gz
echo "$(pwd)/apache-maven-3.9.4/bin" >> $GITHUB_PATH
curl -LO https://dlcdn.apache.org/maven/maven-3/3.9.9/binaries/apache-maven-3.9.9-bin.tar.gz
tar -xf apache-maven-3.9.9-bin.tar.gz
echo "$(pwd)/apache-maven-3.9.9/bin" >> $GITHUB_PATH
- name: Install Hadoop
working-directory: ./.ci_bin
run: |
Expand Down
12 changes: 6 additions & 6 deletions integration-tests/ORMDockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,14 +42,14 @@ RUN pip3 install mysql-connector-python PyMySQL sqlalchemy
# Setup JAVA_HOME -- useful for docker commandline
ENV JAVA_HOME /usr/lib/jvm/java-17-openjdk-amd64/

# install the current latest maven version, `v3.9.4`, because apt installed one does not work with jdk 17
ADD https://apache.osuosl.org/maven/maven-3/3.9.4/binaries/apache-maven-3.9.4-bin.tar.gz apache-maven-3.9.4-bin.tar.gz
RUN tar zxvf apache-maven-3.9.4-bin.tar.gz && \
cp -r apache-maven-3.9.4 /opt && \
rm -rf apache-maven-3.9.4 apache-maven-3.9.4-bin.tar.gz
# install the current latest maven version, `v3.9.9`, because apt installed one does not work with jdk 17
ADD https://dlcdn.apache.org/maven/maven-3/3.9.9/binaries/apache-maven-3.9.9-bin.tar.gz apache-maven-3.9.9-bin.tar.gz
RUN tar zxvf apache-maven-3.9.9-bin.tar.gz && \
cp -r apache-maven-3.9.9 /opt && \
rm -rf apache-maven-3.9.9 apache-maven-3.9.9-bin.tar.gz

# add maven binary
ENV PATH /opt/apache-maven-3.9.4/bin:$PATH
ENV PATH /opt/apache-maven-3.9.9/bin:$PATH

# install dolt from source
WORKDIR /root/building
Expand Down
3 changes: 2 additions & 1 deletion integration-tests/orm-tests/orm-tests.bats
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ setup() {
cd $REPO_NAME

USER="dolt"
dolt sql-server --host 0.0.0.0 --user=$USER --loglevel=trace &
dolt sql -q "CREATE USER dolt@'%'; GRANT ALL ON *.* TO dolt@'%';"
dolt sql-server --host 0.0.0.0 --loglevel=trace &
SERVER_PID=$!

# Give the server a chance to start
Expand Down
Loading