This is an automated email from the ASF dual-hosted git repository.
franztt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/openserverless.git
The following commit(s) were added to refs/heads/main by this push:
new 9e539a2 General update (#38)
9e539a2 is described below
commit 9e539a201195b9cb7eb644dbdfdc012c6f98ab31
Author: Michele Sciabarra <[email protected]>
AuthorDate: Thu Aug 8 18:37:19 2024 +0200
General update (#38)
* runtimes
* Versions
* adding z.sh
* defined branch for submodules
* set branch
* updates
---------
Co-authored-by: Michele Sciabarra <[email protected]>
Co-authored-by: Michele Sciabarra <[email protected]>
---
.gitmodules | 12 ++++++++++
VERSIONS.md | 48 +++++++++++++++++++++++++++++++++++++++
cli | 2 +-
cloud-init.yaml | 3 +++
openserverless-cli.code-workspace | 6 ++++-
runtimes | 1 +
task | 1 +
testing | 1 +
8 files changed, 72 insertions(+), 2 deletions(-)
diff --git a/.gitmodules b/.gitmodules
index 7abccf3..4969a62 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -10,3 +10,15 @@
path = operator
url = https://github.com/apache/openserverless-operator
branch = main
+[submodule "testing"]
+ path = testing
+ url = https://github.com/apache/openserverless-testing
+ branch = main
+[submodule "task"]
+ path = task
+ url = https://github.com/apache/openserverless-task
+ branch = main
+[submodule "runtimes"]
+ path = runtimes
+ url = https://github.com/apache/openserverless-runtimes
+ branch = main
diff --git a/VERSIONS.md b/VERSIONS.md
new file mode 100644
index 0000000..44bd6a3
--- /dev/null
+++ b/VERSIONS.md
@@ -0,0 +1,48 @@
+# Versioning in OpenServerless
+
+This document lists the versioning scheme adopted in the OpenServerles
projects.
+
+# General schema:
+
+We use semantic version in this format:
+
+```
+X.Y.Z-<timestamp>.<variant>
+```
+
+the `<timestamp>` is in format `yymmddHHMM` and can be obtained easily with
`date +%y%m%d%H%M`
+
+the `<variant>` identifies some state like `<dev>` `<alpha>` or some special
cases
+
+# Tags and branches
+
+Whem using versions in tags (like in the CLI) the version MUST have the v in
front. This is required by GO versioning.
+
+When using version in branches (like in tasks) the version MUST NOT have the v
in from. This makes easier to compare.
+
+# Image tags
+
+We should use versions in docker image tags. We have 2 cases:
+
+- normal tags of OpenServerless images, like the operator:
+
+we follow the general schema: for example
apache/openserverless-operator:0.1.0-alpha.2407311416
+
+- runtimes
+
+Runtimes are special because they depends on the language so the version is
actually
+
+```
+<language-version>-<timestamp>[.<variant>]
+```
+
+where:
+- `<language-version>` is the version of the language (Python 3.11, NodeJS
20.1 etc)
+- `<timestamp>` is the timestamp (and it is automatically calculated and)
+- `<variant>` identifies a variant of the image, like an `ai` version
(3.11-2407311140.ai) or a customer specific version (3.11-2407311140.ca).
+
+
+
+
+
+
diff --git a/cli b/cli
index 901d2d7..b898704 160000
--- a/cli
+++ b/cli
@@ -1 +1 @@
-Subproject commit 901d2d78553dc8513ec3999775dfd3a5da1d811a
+Subproject commit b898704f2b1e133d60f69c8d782c3c0707879550
diff --git a/cloud-init.yaml b/cloud-init.yaml
index 54d46dd..653a380 100644
--- a/cloud-init.yaml
+++ b/cloud-init.yaml
@@ -37,6 +37,9 @@ runcmd:
curl -L https://nixos.org/nix/install | sudo -u "$USR" sh
# get openserverless sources
cd $HOME
+ # add z.sh
+ curl "https://raw.githubusercontent.com/rupa/z/master/z.sh"; -o
"$HOME/.z.sh"
+ echo "source $HOME/.z.sh" >> $HOME/.bashrc
# add aliases
echo "source $HOME/openserverless/aliases" >>$HOME/.bashrc
# change owner to everything
diff --git a/openserverless-cli.code-workspace
b/openserverless-cli.code-workspace
index 5064a6c..34bbc8a 100644
--- a/openserverless-cli.code-workspace
+++ b/openserverless-cli.code-workspace
@@ -1,8 +1,12 @@
{
"folders": [
{
- "name": "openserverless-cli",
+ "name": "cli",
"path": "cli"
+ },
+ {
+ "name": "task",
+ "path": "task"
}
],
"settings": {
diff --git a/runtimes b/runtimes
new file mode 160000
index 0000000..71b93f2
--- /dev/null
+++ b/runtimes
@@ -0,0 +1 @@
+Subproject commit 71b93f2b39c01a5b807fd1ce881b9249205be399
diff --git a/task b/task
new file mode 160000
index 0000000..36e35de
--- /dev/null
+++ b/task
@@ -0,0 +1 @@
+Subproject commit 36e35de36b7541b66438a926f4fe1ca45c9c2c35
diff --git a/testing b/testing
new file mode 160000
index 0000000..12ba7e8
--- /dev/null
+++ b/testing
@@ -0,0 +1 @@
+Subproject commit 12ba7e8786ce398b8427c7d35d99a6fd8a364cde
