You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openserverless.apache.org by ms...@apache.org on 2026/09/04 10:11:48 UTC

(openserverless) 01/04: oplugins in build

This is an automated email from the ASF dual-hosted git repository.

sciabarracom pushed a commit to branch 0.9.0
in repository https://gitbox.apache.org/repos/asf/openserverless.git

commit 6d06fc5c3fc0c3ab5c8ea8d253a34ad3612b6e94
Author: Michele Sciabarra <mi...@sciabarra.com>
AuthorDate: Thu Sep 3 17:53:53 2026 +0200

    oplugins in build
---
 Taskfile.yml             | 18 +++++++++---------
 build-and-test-ubuntu.sh |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Taskfile.yml b/Taskfile.yml
index 237522b..e97872e 100644
--- a/Taskfile.yml
+++ b/Taskfile.yml
@@ -22,7 +22,7 @@ vars:
   RELEASE:
     sh: |
         if test -e .git
-        then git -C olaris-op rev-parse --short HEAD
+        then git -C oplugins-op rev-parse --short HEAD
         else
           if test -e RELEASE
           then cat RELEASE
@@ -33,7 +33,7 @@ vars:
   OPERATOR_TAG: "{{.RELEASE}}"
 
   OPERATOR_IMG:
-    sh: awk -F= '/ARG OPERATOR_IMAGE_DEFAULT=/ { print $2 ; exit }' olaris-op/Dockerfile
+    sh: awk -F= '/ARG OPERATOR_IMAGE_DEFAULT=/ { print $2 ; exit }' oplugins-op/Dockerfile
   OPERATOR_SRC: "{{.OPERATOR_IMG}}:{{.OPERATOR_TAG}}"
 
   STREAMER_TAG: "{{.OPERATOR_TAG}}"
@@ -92,7 +92,7 @@ tasks:
       desc: build the operator
       deps:
       - cli
-      dir: olaris-op
+      dir: oplugins-op
       cmds:
       - echo Building {{.OPERATOR_SRC}}
       - git tag -d $(git tag) && git tag {{.OPERATOR_TAG}}
@@ -140,7 +140,7 @@ tasks:
       - git tag -d $(git tag) && git tag {{.OPENSERVERLESS_TAG}}
       - |
         export PATH="{{.TASKFILE_DIR}}:$PATH"
-        export OPS_ROOT="{{.TASKFILE_DIR}}/olaris"
+        export OPS_ROOT="{{.TASKFILE_DIR}}/oplugins"
         task build-all
       - task: image-save
         vars:
@@ -157,7 +157,7 @@ tasks:
       - task build-common
       - task build
       - task render-runtimes
-      - cp runtimes.json ../olaris/runtimes.json
+      - cp runtimes.json ../oplugins/runtimes.json
       - task: runtimes-save
 
     runtimes-save:
@@ -176,7 +176,7 @@ tasks:
 
     opsroot:
       desc: build current opsroot.json
-      dir: olaris
+      dir: oplugins
       cmds:
       - test -e opsroot.orig || jq . <opsroot.json >opsroot.orig
       - >
@@ -195,7 +195,7 @@ tasks:
       - task: cli
       - mkdir -p ~/.local/bin ~/.ops/{{.OPS_BRANCH}}
       - ln -sf $(pwd)/ops ~/.local/bin/ops
-      - test -d ~/.ops/{{.OPS_BRANCH}}/olaris || ln -sf $(pwd)/olaris ~/.ops/{{.OPS_BRANCH}}/olaris
+      - test -d ~/.ops/{{.OPS_BRANCH}}/oplugins || ln -sf $(pwd)/oplugins ~/.ops/{{.OPS_BRANCH}}/oplugins
       - touch ~/.profile
       - |
         if ! grep -q OPS_BRANCH= ~/.profile
@@ -210,7 +210,7 @@ tasks:
       desc: initialize git if missing
       cmds:
       - |
-        for i in build cli olaris-op runtimes streamer admin-api
+        for i in build cli oplugins-op runtimes streamer admin-api
         do
           cd "$i"
           if ! test -e .git
@@ -238,7 +238,7 @@ tasks:
       cmds:
         - |
           export PATH="{{.TASKFILE_DIR}}:$PATH"
-          export OPS_ROOT="{{.TASKFILE_DIR}}/olaris"
+          export OPS_ROOT="{{.TASKFILE_DIR}}/oplugins"
           export OPS_BRANCH="{{.OPS_BRANCH}}"
           which ops
           ops -info
diff --git a/build-and-test-ubuntu.sh b/build-and-test-ubuntu.sh
index 08056fb..8f2a0a3 100755
--- a/build-and-test-ubuntu.sh
+++ b/build-and-test-ubuntu.sh
@@ -98,7 +98,7 @@ echo "Building and testing"
 # regardless of the caller's working directory (e.g. a login shell resets it).
 cd "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 git config --global --add safe.directory "$PWD"
-git config --global --add safe.directory "$PWD/olaris-op"
+git config --global --add safe.directory "$PWD/oplugins-op"
 
 git config --global --get user.name  >/dev/null || git config --global user.name  "Build OpenServerless"
 git config --global --get user.email >/dev/null || git config --global user.email "noreply@example.com"