Skip to content

Commit

Permalink
ci: now using KALISIO_GITHUB_URL
Browse files Browse the repository at this point in the history
  • Loading branch information
robinbourianes-kalisio committed Jun 7, 2024
1 parent c778c87 commit 6f6f7a5
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
run: bash ./scripts/init_runner.sh ${{ github.job }}
- name: Setup workspace
env:
GITHUB_DEVELOPMENT_TOKEN: ${{ secrets.GH_DEVELOPMENT_TOKEN }}
KALISIO_GITHUB_URL: ${{ secrets.KALISIO_GITHUB_URL }}
run: bash ./scripts/setup_workspace.sh -k kli
- name: Build app
env:
Expand Down
9 changes: 3 additions & 6 deletions scripts/setup_workspace.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ set -euo pipefail
THIS_FILE=$(readlink -f "${BASH_SOURCE[0]}")
THIS_DIR=$(dirname "$THIS_FILE")
ROOT_DIR=$(dirname "$THIS_DIR")
WORKSPACE_DIR="$(dirname "$ROOT_DIR")"

. "$THIS_DIR/kash/kash.sh"

Expand Down Expand Up @@ -37,13 +38,9 @@ done

begin_group "Setting up workspace ..."

if [ "$CI" = true ]; then
WORKSPACE_DIR="$(dirname "$ROOT_DIR")"
DEVELOPMENT_REPO_URL="https://$GITHUB_DEVELOPMENT_TOKEN@github.com/kalisio/development.git"
else
if [ "$CI" != true ]; then
shift $((OPTIND-1))
WORKSPACE_DIR="$1"
DEVELOPMENT_REPO_URL="$GITHUB_URL/kalisio/development.git"

# unset KALISIO_DEVELOPMENT_DIR because we want kli to clone everyhting in $WORKSPACE_DIR
unset KALISIO_DEVELOPMENT_DIR
Expand All @@ -52,7 +49,7 @@ fi
setup_app_workspace \
"$ROOT_DIR" \
"$WORKSPACE_DIR" \
"$DEVELOPMENT_REPO_URL" \
"$KALISIO_GITHUB_URL/kalisio/development.git" \
"$WORKSPACE_NODE" \
"workspaces/apps" \
"$WORKSPACE_KIND" \
Expand Down

0 comments on commit 6f6f7a5

Please sign in to comment.