Skip to content

Commit

Permalink
Merge remote-tracking branch 'apache/main' into HEAD
Browse files Browse the repository at this point in the history
  • Loading branch information
andygrove committed Feb 26, 2025
2 parents f44e520 + 315d6a7 commit e3e9951
Show file tree
Hide file tree
Showing 12 changed files with 1,395 additions and 1,261 deletions.
2 changes: 1 addition & 1 deletion .github/actions/rust-test/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ runs:
shell: bash
run: |
cd native
cargo install cargo-machete && cargo machete
cargo install cargo-machete --version 0.7.0 && cargo machete
- name: Cache Maven dependencies
uses: actions/cache@v4
Expand Down
13 changes: 13 additions & 0 deletions .github/workflows/docker-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,23 @@ jobs:
contents: read
packages: write
steps:
- name: Remove unnecessary files
run: |
echo "Disk space before cleanup:"
df -h
docker system prune -af
sudo rm -rf /tmp/*
sudo rm -rf /opt/hostedtoolcache
sudo rm -rf "$AGENT_TOOLSDIRECTORY"
sudo apt-get clean
echo "Disk space after cleanup:"
df -h
- name: Set up Java
uses: actions/setup-java@v3
with:
java-version: '17'
distribution: 'temurin'
cache: 'maven'
- name: Extract Comet version
id: extract_version
run: |
Expand All @@ -63,3 +75,4 @@ jobs:
push: true
tags: ghcr.io/apache/datafusion-comet:spark-3.4-scala-2.12-${{ env.COMET_VERSION }}
file: kube/Dockerfile
no-cache: true
3 changes: 3 additions & 0 deletions kube/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,9 @@ COPY .scalafix.conf /comet/.scalafix.conf
COPY Makefile /comet/Makefile
COPY pom.xml /comet/pom.xml

RUN mkdir -p /root/.m2 && \
echo '<settings><mirrors><mirror><id>central</id><mirrorOf>central</mirrorOf><url>https://repo1.maven.org/maven2</url></mirror></mirrors></settings>' > /root/.m2/settings.xml

# Pick the JDK instead of JRE to compile Comet
RUN cd /comet \
&& JAVA_HOME=$(readlink -f $(which javac) | sed "s/\/bin\/javac//") make release-nogit PROFILES="-Pspark-$SPARK_VERSION -Pscala-$SCALA_VERSION"
Expand Down
Loading

0 comments on commit e3e9951

Please sign in to comment.