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 0cf2632 updated workspaces and direnv (#24)
0cf2632 is described below
commit 0cf26322fd47fa9b8cb14c7267cb84e825ae81fd
Author: Michele Sciabarra <[email protected]>
AuthorDate: Mon Jul 22 16:33:51 2024 +0100
updated workspaces and direnv (#24)
* updated workspaces and direnv
* update readme
---------
Co-authored-by: Michele Sciabarra <[email protected]>
---
.gitignore | 1 +
README.md | 9 ++++++++-
cli | 2 +-
direnv-init.sh | 3 +++
get-diff.sh | 36 ++++++++++++++++++++++++++++++++++
openserverless-cli.code-workspace | 17 ++++++++++++++++
openserverless-operator.code-workspace | 17 ++++++++++++++++
openserverless.code-workspace | 16 +++++----------
operator | 2 +-
site | 2 +-
10 files changed, 90 insertions(+), 15 deletions(-)
diff --git a/.gitignore b/.gitignore
index 6bb34a4..9af3daa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
.attic/
+.vscode/
diff --git a/README.md b/README.md
index 2027ff1..dce9edc 100644
--- a/README.md
+++ b/README.md
@@ -130,7 +130,14 @@ git config --global user.email "<your-email>"
5. Click on `openserverless` then select Linux if requested
-6. Click on the menu bar on `File` then `Openworkspace from file`, then select
the `openserverless` folder and open the `openserverless.code-workspace`.
Select `Linux` and then `Trust the authors` if requested.
+6. Click on the menu bar on `File` then `Openworkspace from file`, then select
the `openserverless` folder and open one of the workspaces. Currently:
+
+- `openserverless-cli.code-workspace`: for the CLI
+- `openserverless.code-workspace`: for the Operator
+- `openserverless.code-workspace`: everything else
+
+
+ Select `Linux` and then `Trust the authors` if requested.
## Access to the subprojects
diff --git a/cli b/cli
index a389dd4..901d2d7 160000
--- a/cli
+++ b/cli
@@ -1 +1 @@
-Subproject commit a389dd4304260ed303974be28c60f1312127bfe0
+Subproject commit 901d2d78553dc8513ec3999775dfd3a5da1d811a
diff --git a/direnv-init.sh b/direnv-init.sh
index 84ba2f4..fb79681 100755
--- a/direnv-init.sh
+++ b/direnv-init.sh
@@ -1,5 +1,8 @@
#!/bin/bash
cd "$(dirname "${BASH_SOURCE[0]}")" && pwd
+git clone https://github.com/nix-community/nix-direnv $HOME/nix-direnv
+mkdir -p $HOME/.config/direnv
+echo 'source $HOME/nix-direnv/direnvrc' >>$HOME/.config/direnv/direnvrc
find . -name '.envrc' -execdir direnv allow . pwd \;
find . -name '.envrc' -execdir direnv exec . pwd \;
diff --git a/get-diff.sh b/get-diff.sh
new file mode 100644
index 0000000..a82b68f
--- /dev/null
+++ b/get-diff.sh
@@ -0,0 +1,36 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+F=${1:?file}
+
+FILE=$(realpath $F)
+echo $FILE
+
+CUR="$(basename $FILE)"
+CONT="$(dirname $FILE)"
+while ! test -d ${CONT}.diff
+do
+ echo $CUR
+ CUR="$(basename $CONT)/$CUR"
+ CONT=$(dirname $CONT)
+ echo $CONT
+done
+
+echo CONTAINER $CONT
+echo PATH $CUR
+
+code -r -d ${CONT}.diff/$CUR $CONT/$CUR
\ No newline at end of file
diff --git a/openserverless-cli.code-workspace
b/openserverless-cli.code-workspace
new file mode 100644
index 0000000..5064a6c
--- /dev/null
+++ b/openserverless-cli.code-workspace
@@ -0,0 +1,17 @@
+{
+ "folders": [
+ {
+ "name": "openserverless-cli",
+ "path": "cli"
+ }
+ ],
+ "settings": {
+ "workbench.colorCustomizations": {
+ "activityBar.background": "#5b09e0",
+ "titleBar.activeBackground": "#5b09e0",
+ "titleBar.activeForeground": "#5b09e0",
+ "statusBar.background": "#5b09e0"
+ },
+ "go.goroot":
"/nix/store/nnh57s7m672k6snkanhz1kb18skwjpbg-go-1.21.11/share/go"
+ }
+}
diff --git a/openserverless-operator.code-workspace
b/openserverless-operator.code-workspace
new file mode 100644
index 0000000..f802d83
--- /dev/null
+++ b/openserverless-operator.code-workspace
@@ -0,0 +1,17 @@
+{
+ "folders": [
+ {
+ "name": "openserverless-operator",
+ "path": "operator"
+ }
+ ],
+ "settings": {
+ "workbench.colorCustomizations": {
+ "activityBar.background": "#32cb0f",
+ "titleBar.activeBackground": "#32cb0f",
+ "titleBar.activeForeground": "#32cb0f",
+ "statusBar.background": "#32cb0f"
+
+ }
+ }
+}
diff --git a/openserverless.code-workspace b/openserverless.code-workspace
index 2e31ea1..852c8bb 100644
--- a/openserverless.code-workspace
+++ b/openserverless.code-workspace
@@ -4,14 +4,6 @@
"name": "operator",
"path": "operator"
},
- {
- "name": "task",
- "path": "cli/openserverless-task"
- },
- {
- "name": "cli",
- "path": "cli"
- },
{
"name": "site",
"path": "site"
@@ -19,12 +11,14 @@
{
"name": "root",
"path": "."
+ }
],
"settings": {
"workbench.colorCustomizations": {
- "activityBar.background": "#0F3506",
- "titleBar.activeBackground": "#0F3506",
- "titleBar.activeForeground": "#0F3506"
+ "activityBar.background": "#d2e313",
+ "titleBar.activeBackground": "#d2e313",
+ "titleBar.activeForeground": "#d2e313",
+ "statusBar.background": "#d2e313"
}
}
}
diff --git a/operator b/operator
index cfc6a3a..843d6d2 160000
--- a/operator
+++ b/operator
@@ -1 +1 @@
-Subproject commit cfc6a3ac71fbb94874299cadc5ef388bdf34954d
+Subproject commit 843d6d259a4e3a8385547e3817e518098a35c25d
diff --git a/site b/site
index 582990f..588ffbf 160000
--- a/site
+++ b/site
@@ -1 +1 @@
-Subproject commit 582990f135c63ae3f36a8f08498f8a2552c69e8f
+Subproject commit 588ffbf8321fd9c167c6242fafb7eec98a31e5d3
