Revert "chore(stack)!: Temporarily disable Stack in Dockerfile-legacy…

… and tests" This reverts commit fc77b1c. Signed-off-by: Martin Nonnenmacher <[email protected]>
oss-review-toolkit · Nov 20, 2023 · 8bf89ad · 8bf89ad
1 parent a9bd271
commit 8bf89ad
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/Dockerfile-legacy b/Dockerfile-legacy
@@ -168,8 +168,7 @@ RUN /opt/ort/bin/export_proxy_certificates.sh /tmp/certificates/ && \
     # Install golang in order to have `go mod` as package manager.
     curl -ksS https://dl.google.com/go/go$GO_VERSION.linux-amd64.tar.gz | tar -C /opt -xz && \
     curl -ksS https://raw.githubusercontent.com/golang/dep/v$GO_DEP_VERSION/install.sh | sh && \
-    # Temporarily disable installation of Stack as GitHub runners are running out of disk space.
-    #curl -ksS https://raw.githubusercontent.com/commercialhaskell/stack/v$HASKELL_STACK_VERSION/etc/scripts/get-stack.sh | sh && \
+    curl -ksS https://raw.githubusercontent.com/commercialhaskell/stack/v$HASKELL_STACK_VERSION/etc/scripts/get-stack.sh | sh && \
     mkdir -p $SWIFT_HOME && \
     curl -L https://download.swift.org/swift-$SWIFT_VERSION-release/ubuntu2204/swift-$SWIFT_VERSION-RELEASE/swift-$SWIFT_VERSION-RELEASE-ubuntu22.04.tar.gz \
         | tar -xz -C $SWIFT_HOME --strip-components=2 && \

diff --git a/plugins/package-managers/stack/src/funTest/kotlin/StackFunTest.kt b/plugins/package-managers/stack/src/funTest/kotlin/StackFunTest.kt
@@ -31,9 +31,7 @@ import org.ossreviewtoolkit.utils.test.matchExpectedResult
 
 class StackFunTest : WordSpec({
     "Resolving project dependencies" should {
-        // TODO: Tests are temporarily disabled as GitHub runners are running out of disk space. Enable them again once
-        //       a better solution was implemented.
-        "succeed for quickcheck-state-machine".config(enabled = false) {
+        "succeed for quickcheck-state-machine" {
             val definitionFile = getAssetFile("projects/external/quickcheck-state-machine/stack.yaml")
             val suffix = "-windows".takeIf { Os.isWindows }.orEmpty()
             val expectedResultFile = getAssetFile(
@@ -45,7 +43,7 @@ class StackFunTest : WordSpec({
             result.toYaml() should matchExpectedResult(expectedResultFile)
         }
 
-        "succeed for stack-yesodweb-simple".config(enabled = false) {
+        "succeed for stack-yesodweb-simple" {
             val definitionFile = getAssetFile("projects/synthetic/stack-yesodweb-simple/stack.yaml")
             val expectedResultFile = getAssetFile("projects/synthetic/stack-yesodweb-simple-expected-output.yml")