Compare commits

..

2 Commits

Author SHA1 Message Date
e6dfff255c v3.7.3
=====================================================================

--- Changes ------------------------------

- Helm template generation looks for default values in file://
  dependencies in addition to the standard values locations

- vundle installer now *actually installs Vundle.vim* if it is missing
2023-11-11 15:13:30 -07:00
15942bb08d v3.7.2
=====================================================================

--- Bug Fixes ----------------------------

- Various github-actions fixes
2023-11-10 17:41:01 -07:00
4 changed files with 36 additions and 8 deletions

View File

@ -1,7 +1,7 @@
--- # allow running scwrypts in Github Actions --- # allow running scwrypts in Github Actions
name: scwrypts name: scwrypts
author: yage author: yage
description: check requird dependencies and run a scwrypt description: check required dependencies and run a scwrypt
inputs: inputs:
scwrypt: scwrypt:
@ -27,7 +27,7 @@ runs:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
with: with:
repository: wrynegade/scwrypts repository: wrynegade/scwrypts
path: ./scwrypts path: ./wrynegade/scwrypts
ref: ${{ inputs.version }} ref: ${{ inputs.version }}
- name: check dependencies - name: check dependencies
@ -43,7 +43,7 @@ runs:
sudo apt-get update sudo apt-get update
sudo apt-get install --yes zsh fzf ripgrep sudo apt-get install --yes zsh fzf ripgrep
for D in $($GITHUB_WORKSPACE/scwrypts/scwrypts -n --name check-all-dependencies --group ci --type zsh) for D in $($GITHUB_WORKSPACE/wrynegade/scwrypts/scwrypts -n --name check-all-dependencies --group ci --type zsh)
do do
echo "--- installing $D ---" echo "--- installing $D ---"
( sudo apt-get install --yes $D; exit 0; ) ( sudo apt-get install --yes $D; exit 0; )
@ -51,11 +51,12 @@ runs:
} > $HOME/.scwrypts.apt-get.log 2>&1 } > $HOME/.scwrypts.apt-get.log 2>&1
echo "updating virtual dependencies" echo "updating virtual dependencies"
$GITHUB_WORKSPACE/scwrypts/scwrypts -n \ $GITHUB_WORKSPACE/wrynegade/scwrypts/scwrypts -n \
--name scwrypts/virtualenv/update-all \ --name scwrypts/virtualenv/update-all \
--group scwrypts \ --group scwrypts \
--type zsh \ --type zsh \
> $HOME/.scwrypts.virtualenv.log 2>&1 ;
#> $HOME/.scwrypts.virtualenv.log 2>&1
echo "CI_SCWRYPTS_READY=1" >> $GITHUB_ENV echo "CI_SCWRYPTS_READY=1" >> $GITHUB_ENV
exit 0 exit 0
@ -65,4 +66,4 @@ runs:
env: env:
CI: true CI: true
SCWRYPTS_ENV: ${{ inputs.scwrypts-env }} SCWRYPTS_ENV: ${{ inputs.scwrypts-env }}
run: $GITHUB_WORKSPACE/scwrypts/scwrypts ${{inputs.scwrypt}} -- ${{inputs.args}} run: $GITHUB_WORKSPACE/wrynegade/scwrypts/scwrypts ${{inputs.scwrypt}} -- ${{inputs.args}} || exit 1

View File

@ -54,6 +54,28 @@ _HELM__GET_CHART_ROOT() {
} }
_HELM__GET_DEFAULT_VALUES_ARGS() { _HELM__GET_DEFAULT_VALUES_ARGS() {
for LOCAL_REPOSITORY in $(\
cat "$CHART_ROOT/Chart.yaml" \
| yq -r '.dependencies[] | .repository' \
| grep '^file://' \
| sed 's|file://||' \
)
do
[[ $LOCAL_REPOSITORY =~ ^[/~] ]] \
&& LOCAL_REPOSITORY_ROOT="$LOCAL_REPOSITORY" \
|| LOCAL_REPOSITORY_ROOT="$CHART_ROOT/$LOCAL_REPOSITORY" \
;
for F in \
"$LOCAL_REPOSITORY_ROOT/values.yaml" \
"$LOCAL_REPOSITORY_ROOT/values.test.yaml" \
"$LOCAL_REPOSITORY_ROOT/tests/default.yaml" \
;
do
[ -f "$F" ] && HELM_ARGS+=(--values "$F")
done
done
for F in \ for F in \
"$CHART_ROOT/values.yaml" \ "$CHART_ROOT/values.yaml" \
"$CHART_ROOT/values.test.yaml" \ "$CHART_ROOT/values.test.yaml" \
@ -63,3 +85,4 @@ _HELM__GET_DEFAULT_VALUES_ARGS() {
[ -f "$F" ] && HELM_ARGS+=(--values "$F") [ -f "$F" ] && HELM_ARGS+=(--values "$F")
done done
} }

View File

@ -20,7 +20,7 @@ VUNDLE__PLUGIN_LIST=$(ls $VUNDLE__PLUGIN_DIR | grep -v 'Vundle.vim' | grep -v 'b
source $VUNDLE__BUILD_DEFINITIONS source $VUNDLE__BUILD_DEFINITIONS
for PLUGIN in $(echo $VUNDLE__PLUGIN_LIST) for PLUGIN in $(echo $VUNDLE__PLUGIN_LIST)
do do
typeset -f VUNDLE__BUILD__$PLUGIN >/dev/null 2>/dev/null || { which VUNDLE__BUILD__$PLUGIN >/dev/null 2>/dev/null || {
echo -e "\nVUNDLE__BUILD__$PLUGIN() {\n # ... build steps from $HOME/.vim/$PLUGIN \n}" \ echo -e "\nVUNDLE__BUILD__$PLUGIN() {\n # ... build steps from $HOME/.vim/$PLUGIN \n}" \
>> $VUNDLE__BUILD_DEFINITIONS >> $VUNDLE__BUILD_DEFINITIONS
VUNDLE__BUILD__$PLUGIN() {} VUNDLE__BUILD__$PLUGIN() {}

View File

@ -8,7 +8,11 @@ CHECK_ENVIRONMENT
##################################################################### #####################################################################
PLUGIN_INSTALL() { PLUGIN_INSTALL() {
VUNDLE__PLUGIN_INSTALL || return 1 [ -d "$HOME/.vim/bundle/Vundle.vim" ] || {
mkdir -p "$HOME/.vim/bundle/"
git clone https://github.com/VundleVim/Vundle.vim.git "$HOME/vim/budle/Vundle.vim"
}
VUNDLE__PLUGIN_INSTALL || return 1
VUNDLE__REBUILD_PLUGINS || return 2 VUNDLE__REBUILD_PLUGINS || return 2
} }