chore: ci test - static build

Author: satran004

.github/workflows/build-graalvm.yml

@@ -10,9 +10,6 @@ on:
 jobs:
   buildAndPush:
     runs-on: ubuntu-22.04
-    strategy:
-      matrix:
-        platform: ["linux/amd64", "linux/arm64"]
     steps:
       - uses: earthly/actions-setup@v1
         with:
@@ -35,6 +32,3 @@ jobs:
           echo "TAG=${TAG}" >> $GITHUB_ENV
       - name: Run build
         run: earthly +build --tag ${{ env.TAG }} --build_type=native-ci
-#      - name: Build native image
-#        run: ./gradlew --no-daemon -i -Pversion=${{ env.TAG }} clean build nativeCompile
-#        working-directory: ./applications/cli

.github/workflows/release.yml

@@ -8,9 +8,6 @@ on:
 jobs:
   buildAndPush:
     runs-on: self-hosted
-#    strategy:
-#      matrix:
-#        platform: ["linux/amd64", "linux/arm64"]
     env:
       DOCKERHUB_USERNAME: ${{ secrets.DEV_DOCKERHUB_USERNAME }}
       DOCKERHUB_TOKEN: ${{ secrets.DEV_DOCKERHUB_TOKEN }}

Earthfile

@@ -55,14 +55,6 @@ zip:
   RUN cd /app && zip -r yaci-devkit-${tag}.zip .
   SAVE ARTIFACT yaci-devkit-${tag}.zip AS LOCAL build/yaci-devkit-${tag}.zip
 
-cli-zip:
-  LOCALLY
-  ARG EARTHLY_TARGET_NAME
-  ARG EARTHLY_GIT_SHORT_HASH
-  ARG TARGETOS
-  ARG TARGETARCH
-  BUILD ./applications/cli+zip  --APP_VERSION=${tag} --COMMIT_ID=${EARTHLY_GIT_SHORT_HASH}
-
 test-nodes-setup:
   LOCALLY
   RUN cd build/ && unzip yaci-devkit-${tag}.zip

applications/cli/Earthfile

@@ -1,6 +1,6 @@
 VERSION 0.8
 
-cli-jar:
+cli-java:
   ARG EARTHLY_TARGET_NAME
   ARG EARTHLY_GIT_SHORT_HASH
   ARG APP_VERSION
@@ -103,9 +103,12 @@ docker-build:
     ELSE IF [ "$BUILD_TYPE" = "native-ci" ]
     COPY (+cli-native-ci/yaci-cli* --APP_VERSION=${APP_VERSION}) /app/
     ELSE
-    COPY (+cli-jar/yaci-cli.jar --APP_VERSION=${APP_VERSION}) /app/yaci-cli.jar
+    COPY (+cli-java/yaci-cli.jar --APP_VERSION=${APP_VERSION}) /app/yaci-cli.jar
     END
 
+    COPY docker/yaci-cli.sh /app/
+    RUN chmod +x /app/yaci-cli.sh
+
     RUN mkdir -p /app/config
     COPY docker/application.properties /app/config/
 
@@ -121,25 +124,6 @@ docker-build:
     EXPOSE 1337
     EXPOSE 1442
 
-    IF [ "$BUILD_TYPE" = "native" ]
-    ENTRYPOINT ["/app/yaci-cli"]
-    ELSE
-    ENTRYPOINT ["java", "-jar","/app/yaci-cli.jar"]
-    END
+    ENTRYPOINT ["sh", "/app/yaci-cli.sh"]
 
     SAVE IMAGE --push ${REGISTRY_ORG}/yaci-cli:${APP_VERSION}
-
-zip:
-    LOCALLY
-    ARG TARGETOS
-    ARG TARGETARCH
-    ARG APP_VERSION
-
-    COPY (+cli-native-ci/yaci-cli --APP_VERSION=${APP_VERSION}) build/yaci-cli
-    FROM alpine:3.19.1
-    WORKDIR /app
-    RUN apk add --no-cache zip
-    RUN mkdir -p /app/yaci-cli-${APP_VERSION}-${TARGETOS}-${TARGETARCH}
-    COPY  build/yaci-cli  /app/yaci-cli-${APP_VERSION}-${TARGETOS}-${TARGETARCH}/
-    RUN cd /app && zip -r yaci-cli-${APP_VERSION}-${TARGETOS}-${TARGETARCH}.zip .
-    SAVE ARTIFACT yaci-cli-${APP_VERSION}-${TARGETOS}-${TARGETARCH}.zip AS LOCAL build/yaci-cli-${APP_VERSION}-${TARGETOS}-${TARGETARCH}.zip

applications/cli/docker/yaci-cli.sh

@@ -0,0 +1,16 @@
+#!/bin/bash
+
+# Check if yaci_cli_mode is set in the environment, if not set it to "java"
+if [ -z "$yaci_cli_mode" ]; then
+    yaci_cli_mode="java"
+fi
+
+# Check the value of yaci_cli_mode and run the appropriate command
+if [ "$yaci_cli_mode" == "java" ]; then
+    java -jar /app/yaci-cli.jar
+elif [ "$yaci_cli_mode" == "native" ]; then
+    /app/yaci-cli
+else
+    echo "Invalid mode. Please use 'java' or 'native'."
+    exit 1
+fi

bin/devkit.sh

@@ -5,10 +5,6 @@ cd "$(dirname "$0")"
 SCRIPT_DIR="../scripts"
 CONFIG_DIR="../config"
 
-YACI_CLI_SCRIPT="yaci-cli.sh"
-# Uncomment to run the Java version of yaci-cli
-#YACI_CLI_SCRIPT="yaci-cli-java.sh"
-
 # This is the wrapper script for starting and stopping services and running yaci-cli.sh
 
 # Function to display help message
@@ -45,7 +41,7 @@ case $1 in
             echo "start.sh executed successfully. Running yaci-cli.sh..."
             first_arg="$1"
             shift
-            sh $SCRIPT_DIR/$YACI_CLI_SCRIPT "$@"
+            sh $SCRIPT_DIR/yaci-cli.sh "$@"
         else
             echo "start.sh failed. Not executing yaci-cli.sh."
         fi
@@ -56,7 +52,7 @@ case $1 in
         ;;
     ssh)
         echo "ssh to Devkit container..."
-        sh $SCRIPT_DIR//ssh.sh
+        sh $SCRIPT_DIR/ssh.sh
         ;;
     info)
         echo "Info of Devkit"

config/env

@@ -3,6 +3,7 @@ ogmios_enabled=true
 kupo_enabled=false
 
 node=node1
+yaci_cli_mode=native
 
 #######################################################
 # Ports

config/version

@@ -1,2 +1,2 @@
-tag=0.9.0-dev3
+tag=0.9.0-dev4
 revision=

scripts/yaci-cli-java.sh

@@ -12,4 +12,4 @@ then
     CMD="docker compose"
 fi
 
-$CMD --env-file $ENV_FILE --env-file $VERSION_FILE exec yaci-cli /app/yaci-cli $*
+$CMD --env-file $ENV_FILE --env-file $VERSION_FILE exec yaci-cli /app/yaci-cli.sh $*