You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by rn...@apache.org on 2023/05/10 16:43:08 UTC
[couchdb-ci] branch remove-maven created (now fbc0029)
This is an automated email from the ASF dual-hosted git repository.
rnewson pushed a change to branch remove-maven
in repository https://gitbox.apache.org/repos/asf/couchdb-ci.git
at fbc0029 Revert "Also install maven"
This branch includes the following new commits:
new 3588964 enable nouveau tests
new fbc0029 Revert "Also install maven"
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[couchdb-ci] 01/02: enable nouveau tests
Posted by rn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rnewson pushed a commit to branch remove-maven
in repository https://gitbox.apache.org/repos/asf/couchdb-ci.git
commit 3588964d355aec88d6210828484bf993bca4c898
Author: Robert Newson <Ro...@ibm.com>
AuthorDate: Mon Apr 24 16:25:18 2023 +0100
enable nouveau tests
---
bin/build-test-couchdb.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/bin/build-test-couchdb.sh b/bin/build-test-couchdb.sh
index 0150114..68936ef 100755
--- a/bin/build-test-couchdb.sh
+++ b/bin/build-test-couchdb.sh
@@ -31,5 +31,5 @@ cd couchdb
echo $(whoami)
echo $(pwd)
-./configure --with-curl
+./configure --with-curl --enable-nouveau
make check
[couchdb-ci] 02/02: Revert "Also install maven"
Posted by rn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rnewson pushed a commit to branch remove-maven
in repository https://gitbox.apache.org/repos/asf/couchdb-ci.git
commit fbc00290f13fb31db92a8568f98b6334c8896e83
Author: Robert Newson <Ro...@ibm.com>
AuthorDate: Wed May 10 09:12:01 2023 +0100
Revert "Also install maven"
This reverts commit f94e12848107d5e94c24637b92d1bcaf41b8d0b0.
---
dockerfiles/centos-7 | 5 -----
dockerfiles/debian-bullseye | 5 -----
dockerfiles/debian-buster | 5 -----
dockerfiles/rockylinux-8 | 5 -----
dockerfiles/ubuntu-bionic | 5 -----
dockerfiles/ubuntu-focal | 5 -----
dockerfiles/ubuntu-jammy | 5 -----
7 files changed, 35 deletions(-)
diff --git a/dockerfiles/centos-7 b/dockerfiles/centos-7
index 2a6456e..c72a686 100644
--- a/dockerfiles/centos-7
+++ b/dockerfiles/centos-7
@@ -24,11 +24,6 @@ ENV JAVA_HOME=/opt/java/openjdk
COPY --from=eclipse-temurin:11 $JAVA_HOME $JAVA_HOME
ENV PATH="${JAVA_HOME}/bin:${PATH}"
-# Install Maven
-ENV MAVEN_HOME=/usr/share/maven
-COPY --from=maven:3-eclipse-temurin-11 $MAVEN_HOME $MAVEN_HOME
-ENV PATH="${MAVEN_HOME}/bin:${PATH}"
-
# Choose whether to install SpiderMonkey 1.8.5, default yes
ARG js=js
# Choose whether to install Erlang, default yes
diff --git a/dockerfiles/debian-bullseye b/dockerfiles/debian-bullseye
index 9665bce..4ef92c6 100644
--- a/dockerfiles/debian-bullseye
+++ b/dockerfiles/debian-bullseye
@@ -26,11 +26,6 @@ ENV JAVA_HOME=/opt/java/openjdk
COPY --from=eclipse-temurin:11 $JAVA_HOME $JAVA_HOME
ENV PATH="${JAVA_HOME}/bin:${PATH}"
-# Install Maven
-ENV MAVEN_HOME=/usr/share/maven
-COPY --from=maven:3-eclipse-temurin-11 $MAVEN_HOME $MAVEN_HOME
-ENV PATH="${MAVEN_HOME}/bin:${PATH}"
-
# Choose whether to install SpiderMonkey 1.8.5, default yes
ARG js=js
# Choose whether to install Erlang, default yes
diff --git a/dockerfiles/debian-buster b/dockerfiles/debian-buster
index aee4b08..d9fa19b 100644
--- a/dockerfiles/debian-buster
+++ b/dockerfiles/debian-buster
@@ -26,11 +26,6 @@ ENV JAVA_HOME=/opt/java/openjdk
COPY --from=eclipse-temurin:11 $JAVA_HOME $JAVA_HOME
ENV PATH="${JAVA_HOME}/bin:${PATH}"
-# Install Maven
-ENV MAVEN_HOME=/usr/share/maven
-COPY --from=maven:3-eclipse-temurin-11 $MAVEN_HOME $MAVEN_HOME
-ENV PATH="${MAVEN_HOME}/bin:${PATH}"
-
# Choose whether to install SpiderMonkey 1.8.5, default yes
ARG js=js
# Choose whether to install Erlang, default yes
diff --git a/dockerfiles/rockylinux-8 b/dockerfiles/rockylinux-8
index 0516356..7271aa9 100644
--- a/dockerfiles/rockylinux-8
+++ b/dockerfiles/rockylinux-8
@@ -24,11 +24,6 @@ ENV JAVA_HOME=/opt/java/openjdk
COPY --from=eclipse-temurin:11 $JAVA_HOME $JAVA_HOME
ENV PATH="${JAVA_HOME}/bin:${PATH}"
-# Install Maven
-ENV MAVEN_HOME=/usr/share/maven
-COPY --from=maven:3-eclipse-temurin-11 $MAVEN_HOME $MAVEN_HOME
-ENV PATH="${MAVEN_HOME}/bin:${PATH}"
-
# Choose whether to install SpiderMonkey 1.8.5, default yes
ARG js=js
# Choose whether to install Erlang, default yes
diff --git a/dockerfiles/ubuntu-bionic b/dockerfiles/ubuntu-bionic
index 0d43a52..46c1952 100644
--- a/dockerfiles/ubuntu-bionic
+++ b/dockerfiles/ubuntu-bionic
@@ -24,11 +24,6 @@ ENV JAVA_HOME=/opt/java/openjdk
COPY --from=eclipse-temurin:11 $JAVA_HOME $JAVA_HOME
ENV PATH="${JAVA_HOME}/bin:${PATH}"
-# Install Maven
-ENV MAVEN_HOME=/usr/share/maven
-COPY --from=maven:3-eclipse-temurin-11 $MAVEN_HOME $MAVEN_HOME
-ENV PATH="${MAVEN_HOME}/bin:${PATH}"
-
# Choose whether to install SpiderMonkey 1.8.5, default yes
ARG js=js
# Choose whether to install Erlang, default yes
diff --git a/dockerfiles/ubuntu-focal b/dockerfiles/ubuntu-focal
index 0b3ac63..6f3f2ec 100644
--- a/dockerfiles/ubuntu-focal
+++ b/dockerfiles/ubuntu-focal
@@ -24,11 +24,6 @@ ENV JAVA_HOME=/opt/java/openjdk
COPY --from=eclipse-temurin:11 $JAVA_HOME $JAVA_HOME
ENV PATH="${JAVA_HOME}/bin:${PATH}"
-# Install Maven
-ENV MAVEN_HOME=/usr/share/maven
-COPY --from=maven:3-eclipse-temurin-11 $MAVEN_HOME $MAVEN_HOME
-ENV PATH="${MAVEN_HOME}/bin:${PATH}"
-
# Choose whether to install SpiderMonkey 1.8.5, default yes
ARG js=js
# Choose whether to install Erlang, default yes
diff --git a/dockerfiles/ubuntu-jammy b/dockerfiles/ubuntu-jammy
index c770b2e..63a1a15 100644
--- a/dockerfiles/ubuntu-jammy
+++ b/dockerfiles/ubuntu-jammy
@@ -24,11 +24,6 @@ ENV JAVA_HOME=/opt/java/openjdk
COPY --from=eclipse-temurin:11 $JAVA_HOME $JAVA_HOME
ENV PATH="${JAVA_HOME}/bin:${PATH}"
-# Install Maven
-ENV MAVEN_HOME=/usr/share/maven
-COPY --from=maven:3-eclipse-temurin-11 $MAVEN_HOME $MAVEN_HOME
-ENV PATH="${MAVEN_HOME}/bin:${PATH}"
-
# Choose whether to install SpiderMonkey 1.8.5, default yes
ARG js=js
# Choose whether to install Erlang, default yes