Skip to content

Commit 580c005

Browse files
committed
Fixed install script for eng ui, updated dependency versions for pekko
1 parent f5087a3 commit 580c005

5 files changed

Lines changed: 14 additions & 17 deletions

File tree

iris/project/Libs.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ import sbt._
66
import scala.util.control.NonFatal
77

88
object Libs {
9-
val ScalaVersion = "3.6.2"
9+
val ScalaVersion = "3.6.4"
1010

1111
val `scalatest` = "org.scalatest" %% "scalatest" % "3.2.19" // Apache License 2.0
1212
// val `dotty-cps-async` = "com.github.rssh" %% "dotty-cps-async" % "0.9.23"
1313
val `junit-4-13` = "org.scalatestplus" %% "junit-4-13" % "3.2.19.0"
14-
val `pekko-actor-testkit-typed` = "org.apache.pekko" %% "pekko-actor-testkit-typed" % "1.1.2"
15-
val `nom-tam-fits` = "gov.nasa.gsfc.heasarc" % "nom-tam-fits" % "1.20.2"
14+
val `pekko-actor-testkit-typed` = "org.apache.pekko" %% "pekko-actor-testkit-typed" % "1.1.3"
15+
val `nom-tam-fits` = "gov.nasa.gsfc.heasarc" % "nom-tam-fits" % "1.21.0"
1616
val `tmt-test-reporter` = "com.github.tmtsoftware.rtm" %% "rtm" % "0.4.1"
1717
}
1818

simulation-scripts/install-eng-ui.sh

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,17 @@ cd $ROOT
77
source ./versions.sh
88
version=$ENG_UI_VERSION
99

10+
set -x
1011
cd $ROOT/../apps
1112

12-
rm -r *.txt
13-
rm -r *.zip
13+
rm -f *.txt
14+
rm -f *.zip
1415

1516
ENG_UI_HOME="$ROOT/../apps/"
1617

1718
echo "downloading.. esw-ocs-eng-ui with $version"
18-
curl -L -O https://github.com/tmtsoftware/esw-ocs-eng-ui/archive/$version.zip
19+
curl -L -O https://github.com/tmtsoftware/esw-ocs-eng-ui/releases/download/v$version/esw-ocs-eng-ui.zip
1920

20-
unzip -o $version.zip
21-
cd esw-ocs-eng-ui-$version* && npm install && npm run build
22-
rm -rf ../esw-ocs-eng-ui
23-
mv esw-ocs-eng-ui ../esw-ocs-eng-ui
24-
cd ..
25-
rm -rf esw-ocs-eng-ui-$version*
21+
rm -rf esw-ocs-eng-ui
22+
unzip -o esw-ocs-eng-ui.zip
2623
touch $version.txt

simulation-scripts/start-eng-ui.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@ else
1515
echo "Error: Directory esw-ocs-eng-ui does not exists. downloading..."
1616
sh $ROOT/install-eng-ui.sh
1717
fi
18-
./serve.py
18+
./serve.py

simulation-scripts/versions.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ export ESW_VERSION=f9cbac5
44
#export ESW_VERSION=1.0.0-RC6
55
export CSW_VERSION=6.0.0-RC6
66
export SEQ_SCRIPT_VERSION=1a80475
7-
export TCS_VERSION=0.12.0
7+
export TCS_VERSION=0.12.1
88
export ENG_UI_VERSION=1.0.0-RC1
99
export CHANNEL="https://raw.githubusercontent.com/tmtsoftware/osw-apps/branch-6.0.x/apps.json"

wfos/project/Libs.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ import sbt._
66
import scala.util.control.NonFatal
77

88
object Libs {
9-
val ScalaVersion = "3.6.2"
9+
val ScalaVersion = "3.6.4"
1010

1111
val `scalatest` = "org.scalatest" %% "scalatest" % "3.2.19" // Apache License 2.0
1212
// val `dotty-cps-async` = "com.github.rssh" %% "dotty-cps-async" % "0.9.23"
1313
val `junit-4-13` = "org.scalatestplus" %% "junit-4-13" % "3.2.19.0"
14-
val `pekko-actor-testkit-typed` = "org.apache.pekko" %% "pekko-actor-testkit-typed" % "1.1.2"
15-
val `nom-tam-fits` = "gov.nasa.gsfc.heasarc" % "nom-tam-fits" % "1.20.2"
14+
val `pekko-actor-testkit-typed` = "org.apache.pekko" %% "pekko-actor-testkit-typed" % "1.1.3"
15+
val `nom-tam-fits` = "gov.nasa.gsfc.heasarc" % "nom-tam-fits" % "1.21.0"
1616
val `tmt-test-reporter` = "com.github.tmtsoftware.rtm" %% "rtm" % "0.4.1"
1717
}
1818

0 commit comments

Comments
 (0)