Skip to content

Commit

Permalink
Merge pull request #2 from epics-containers/dev
Browse files Browse the repository at this point in the history
fix schema generation
  • Loading branch information
gilesknap authored Oct 11, 2023
2 parents 29798ec + 2dce114 commit 950727b
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 2 deletions.
3 changes: 3 additions & 0 deletions .devcontainer/.bashrc
Original file line number Diff line number Diff line change
Expand Up @@ -66,3 +66,6 @@ fi
if [ -f ~/.bashrc_dev_container ]; then
. ~/.bashrc_dev_container
fi

source /root/.bash_completions/ibek.sh

1 change: 1 addition & 0 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
"workspaceFolder": "/epics/${localWorkspaceFolderBasename}",
"mounts": [
// Mount some useful local files from the user's home directory
"source=${localWorkspaceFolder}/../,target=/repos,type=bind",
"source=${localEnv:HOME}/.bash_eternal_history,target=/root/.bash_eternal_history,type=bind",
"source=${localWorkspaceFolder}/.devcontainer/.bashrc,target=/root/.bashrc,type=bind",
"source=${localEnv:HOME}/.bashrc_dev_container,target=/root/.bashrc_dev_container,type=bind",
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ export EC_CARGS="
ec dev build --buildx ${EC_TAG} ${EC_PLATFORM} ${EC_PUSH} ${EC_CARGS}

# extract the ioc schema from the runtime image
echo ec dev launch-local ${EC_TAG} --execute \
ec dev launch-local ${EC_TAG} --execute \
'ibek ioc generate-schema /epics/links/ibek/*.ibek.support.yaml' > ibek.ioc.schema.json

# run acceptance tests
Expand Down
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,7 @@ ibek
# The ioc source tree is created here from a template inside the generic ioc
# repo.
# Remove from .gitignore if you want to customize the template.
/ioc/
/ioc/

# dont save workspaces as other users will have differing folders
*workspace
5 changes: 5 additions & 0 deletions user_examples/.bashprofile_dev_container
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,8 @@

apt-get update
apt-get -y --no-install-recommends install vimdiff
# apt-get install what you like

# add some completion
ibek --install-completion bash

0 comments on commit 950727b

Please sign in to comment.