From 6c06fd43bf725d186a36a194ccd939e001de7342 Mon Sep 17 00:00:00 2001 From: James Earl Douglas Date: Sat, 2 Nov 2024 16:39:58 -0700 Subject: [PATCH] Update CI to match --- .github/workflows/build.yml | 5 +-- src/reqs/check.sh | 39 ------------------- src/reqs/project/plugins.sbt | 1 - .../com/earldouglas/helloworld/HelloWorld.fr | 4 -- 4 files changed, 1 insertion(+), 48 deletions(-) delete mode 100755 src/reqs/check.sh delete mode 100644 src/reqs/project/plugins.sbt delete mode 100644 src/reqs/src/main/frege/com/earldouglas/helloworld/HelloWorld.fr diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b3652de..acbc0d0 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -12,7 +12,4 @@ jobs: - uses: actions/setup-java@v1 with: java-version: 8 - - run: sbt test - - run: sbt scripted - - run: sbt publishLocal - - run: src/reqs/check.sh + - run: sbt +test +scripted +publishLocal diff --git a/src/reqs/check.sh b/src/reqs/check.sh deleted file mode 100755 index 843dc1e..0000000 --- a/src/reqs/check.sh +++ /dev/null @@ -1,39 +0,0 @@ -#!/usr/bin/env bash - -set -e - -pushd `dirname $0` - -function test() { - for SCALA_VERSION in 2.4.0 2.13.4 - do - _test - done -} - -function _test() { - TMP_SRC_DIR=`mktemp -d` - cp -rf . $TMP_SRC_DIR - - pushd $TMP_SRC_DIR - - echo "scalaVersion := \"$SCALA_VERSION\"" > scalaVersion.sbt - echo "sbt.version=$SBT_VERSION" > project/build.properties - - cat project/build.properties - cat scalaVersion.sbt - - TMP_HOME_DIR=`mktemp -d` - - curl -s -L $SBT_LAUNCH -o $TMP_HOME_DIR/sbt-launch-$SBT_VERSION.jar - - HOME=$TMP_HOME_DIR java -jar $TMP_HOME_DIR/sbt-launch-$SBT_VERSION.jar clean run - - popd -} - -for SBT_VERSION in 1.3.0 1.3.13 1.4.1 1.4.9 1.5.0 1.5.7 1.6.0 1.6.2 -do - SBT_LAUNCH=https://repo1.maven.org/maven2/org/scala-sbt/sbt-launch/$SBT_VERSION/sbt-launch-$SBT_VERSION.jar - test -done diff --git a/src/reqs/project/plugins.sbt b/src/reqs/project/plugins.sbt deleted file mode 100644 index e538ab1..0000000 --- a/src/reqs/project/plugins.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("com.earldouglas" % "sbt-frege" % "0.1.0-SNAPSHOT") diff --git a/src/reqs/src/main/frege/com/earldouglas/helloworld/HelloWorld.fr b/src/reqs/src/main/frege/com/earldouglas/helloworld/HelloWorld.fr deleted file mode 100644 index bf951ae..0000000 --- a/src/reqs/src/main/frege/com/earldouglas/helloworld/HelloWorld.fr +++ /dev/null @@ -1,4 +0,0 @@ -package com.earldouglas.helloworld.HelloWorld where - -main :: [String] -> IO () -main _ = print "Hello, world!"