Skip to content

Improved support for devcontainer #389

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 4 commits into from
Closed

Improved support for devcontainer #389

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dfe7416
Improved support for devcontainer
james-ball-qualcomm Jan 6, 2025
b447e72
Merging in fixes for running in devcontainer to Derek's changes to se…
james-ball-qualcomm Jan 7, 2025
2839ffc
Merge branch 'main' into 375-setup-script-devcontainer-bugs
james-ball-qualcomm Jan 7, 2025
a3b4c22
Merge branch 'main' into 375-setup-script-devcontainer-bugs
james-ball-qualcomm Jan 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
diag-ditaa-*
arch/manual/isa/**/riscv-isa-manual
gen
gen.*
Copy link
Collaborator

@dhower-qc dhower-qc Jan 9, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what's this for?

Copy link
Collaborator Author

@james-ball-qualcomm james-ball-qualcomm Jan 9, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, wanted to talk to you about this one. I'd like to have the ability to keep old copies of the generated files in my workspace for reference. I want them ignored by Git. So, my scheme is to take the gen directory and rename it to gen. so that's why I've added gen.* in .gitignore. If you have another way of solving this, I'm open to it. This is just what I was imagining as a solution.

Copy link
Collaborator Author

@james-ball-qualcomm james-ball-qualcomm Jan 9, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Derek suggested changing this to *.bak in the .gitignore. I'll do that in some future PR.

node_modules
_site
images
Expand Down
18 changes: 16 additions & 2 deletions bin/setup
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,14 +56,28 @@ else
fi

if [ "${CONTAINER_TYPE}" != "docker" -a "${CONTAINER_TYPE}" != "singularity" -a "${CONTAINER_TYPE}" != "devcontainer" ]; then
echo "BAD CONTAINER TYPE: ${CONTAINER_TYPE}"
echo "BAD CONTAINER TYPE: ${CONTAINER_TYPE}" 1>&2
exit 1
fi

if [ ! -f ${ROOT}/.container-type ]; then
echo ${CONTAINER_TYPE} > ${ROOT}/.container-type
fi

echo "Using ${CONTAINER_TYPE} environment"
print_env() {
if [ "${CONTAINER_TYPE}" == "docker" ]; then
echo "Using Docker environment"
elif [ "${CONTAINER_TYPE}" == "singularity" ]; then
echo "Using Singularity environment"
elif [ "${CONTAINER_TYPE}" == "devcontainer" ]; then
echo "Using devcontainer environment"
else
echo "Unknown container type of ${CONTAINER_TYPE}" 1>&2
exit 1
fi
}

print_env

if [ -v GITHUB_ACTIONS ]; then
echo "Running in a GitHub Action"
Expand Down
Loading