diff --git a/.env b/.env new file mode 100644 index 0000000..b0428ea --- /dev/null +++ b/.env @@ -0,0 +1 @@ +GITEA_TOKEN= diff --git a/Cargo.toml b/Cargo.toml index 5e07655..3869d12 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -7,7 +7,6 @@ edition = "2021" pgrx = "0.14.0" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" -jsonschema = "0.29.1" lazy_static = "1.5.0" boon = "0.6.1" @@ -34,4 +33,4 @@ lto = "thin" panic = "unwind" opt-level = 3 lto = "fat" -codegen-units = 1 \ No newline at end of file +codegen-units = 1 diff --git a/flow b/flow index 611ce9a..4499a6f 100755 --- a/flow +++ b/flow @@ -14,21 +14,6 @@ CARGO_DEPENDENCIES=(cargo-pgrx==0.14.0) GITEA_ORGANIZATION="cellular" GITEA_REPOSITORY="jspg" -env() { - # Check if GITEA_TOKEN is set - if [ -z "$GITEA_TOKEN" ]; then - # If not set, try to get it from kubectl - GITEA_TOKEN=$(kubectl get secret -n cellular gitea-git -o jsonpath='{.data.token}' | base64 --decode) - if [ -z "$GITEA_TOKEN" ]; then - error "GITEA_TOKEN is not set and couldn't be retrieved from kubectl" >&2 - return 2 - fi - export GITEA_TOKEN - fi - - success "Environment variables set" -} - pgrx-prepare() { info "Initializing pgrx..." # Explicitly point to the postgresql@${POSTGRES_VERSION} pg_config, don't rely on 'which' @@ -131,17 +116,16 @@ jspg-usage() { jspg-flow() { case "$1" in - env) env; return $?;; prepare) prepare && cargo-prepare && pgrx-prepare; return $?;; build) build; return $?;; install) install; return $?;; reinstall) clean && install; return $?;; test) test "${@:2}"; return $?;; clean) clean; return $?;; - release) env; release; return $?;; *) return 1 ;; esac } -register-flow "jspg-flow" "jspg-usage" -dispatch "$@" \ No newline at end of file +register-flow "jspg-usage" "jspg-flow" + +dispatch "$@" diff --git a/flows b/flows index c33e7e1..e154758 160000 --- a/flows +++ b/flows @@ -1 +1 @@ -Subproject commit c33e7e1e05741c5c7c20ab75db67be4eefb78653 +Subproject commit e1547580568c976bc4d310d499edb6ea38c89f34