summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas O'Donnell <andytom@users.noreply.github.com>2019-09-30 03:38:53 +0200
committerMatan Kushner <hello@matchai.me>2019-09-30 10:38:53 +0900
commitd335abca3dd144e23523aa2888c293bb151eda17 (patch)
treedac739c36d10edb2591db7c58825cbe5408cd667
parent0eafb2bde720b08c53eb329304d2730c150ad196 (diff)
ci: Remove unused java testsuite (#445)
-rw-r--r--.github/workflows/continuous-integration.yml5
-rw-r--r--tests/Dockerfile16
-rw-r--r--tests/testsuite/java.rs26
-rw-r--r--tests/testsuite/main.rs1
4 files changed, 0 insertions, 48 deletions
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
index e1b3773d4..378149053 100644
--- a/.github/workflows/continuous-integration.yml
+++ b/.github/workflows/continuous-integration.yml
@@ -71,11 +71,6 @@ jobs:
with:
python-version: "3.6.9"
- # Install Java at a fixed version
- - uses: actions/setup-java@master
- with:
- java-version: '12.0.2'
-
# Run the ignored tests that expect the above setup
- uses: actions/checkout@master
- name: Run all tests
diff --git a/tests/Dockerfile b/tests/Dockerfile
index 9f51df324..f7fcae661 100644
--- a/tests/Dockerfile
+++ b/tests/Dockerfile
@@ -48,22 +48,6 @@ RUN curl https://pyenv.run | bash \
# Check that Python was correctly installed
RUN python --version
-# Install Java.
-ENV JAVA_HOME /home/nonroot/java
-ENV PATH $JAVA_HOME/bin:$PATH
-ENV JAVA_URL https://download.java.net/java/GA/jdk12.0.2/e482c34c86bd4bf8b56c0b35558996b9/10/GPL/openjdk-12.0.2_linux-x64_bin.tar.gz
-
-RUN mkdir -p "$JAVA_HOME"
-RUN set -eux; \
- curl -fL -o $JAVA_HOME/openjdk.tgz "$JAVA_URL"; \
- tar --extract \
- --file $JAVA_HOME/openjdk.tgz \
- --directory "$JAVA_HOME" \
- --strip-components 1 \
- --no-same-owner
-
-RUN java -version && javac -version
-
# Create blank project
RUN USER=nonroot cargo new --bin /src/starship
WORKDIR /src/starship
diff --git a/tests/testsuite/java.rs b/tests/testsuite/java.rs
deleted file mode 100644
index 9cced9d08..000000000
--- a/tests/testsuite/java.rs
+++ /dev/null
@@ -1,26 +0,0 @@
-use std::fs::File;
-use std::io;
-
-use ansi_term::Color;
-
-use crate::common;
-
-// When these tests run in the CI, they use Azul's Zulu Java distribution.
-// The version format returned by this java package is irregular and not supported (yet).
-
-//#[test]
-//#[ignore]
-//fn folder_with_pom() -> io::Result<()> {
-// let dir = common::new_tempdir()?;
-// File::create(dir.path().join("pom.xml"))?;
-//
-// let output = common::render_module("java")
-// .arg("--path")
-// .arg(dir.path())
-// .output()?;
-// let actual = String::from_utf8(output.stdout).unwrap();
-//
-// let expected = format!("via {} ", Color::Red.dimmed().paint("☕ "));
-// assert_eq!(expected, actual);
-// Ok(())
-//}
diff --git a/tests/testsuite/main.rs b/tests/testsuite/main.rs
index 5506e2214..471f5332a 100644
--- a/tests/testsuite/main.rs
+++ b/tests/testsuite/main.rs
@@ -10,7 +10,6 @@ mod git_state;
mod git_status;
mod golang;
mod hostname;
-mod java;
mod jobs;
mod line_break;
mod modules;