Skip to content

Commit

Permalink
Merge branch 'main' into fix/netdata
Browse files Browse the repository at this point in the history
Signed-off-by: Arek Kalandyk <36413794+koralowiec@users.noreply.github.com>
  • Loading branch information
koralowiec authored Sep 13, 2024
2 parents 0f5ae9b + ff76760 commit 36b75c4
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 8 deletions.
9 changes: 9 additions & 0 deletions .devcontainer/setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,14 @@ npm install -g @devcontainers/cli

pipx install shfmt-py

# Check if the explainshell container is running
if [ "$(docker ps -q -f name=explainshell)" ]; then
# Stop the running container
docker stop explainshell
# Remove the container
docker rm explainshell
fi

# Run a new explainshell container
# this will add hover annotations in shell script files, assuming mads-hartmann.bash-ide-vscod is installed
docker container run --name explainshell --restart always -p 5000:5000 -d spaceinvaderone/explainshell
14 changes: 8 additions & 6 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -63,26 +63,28 @@ jobs:
- name: "resolving features to test"
id: resolve_features
run: |
if [ ${{ github.event_name }} == 'pull_request' ]; then
if [ ${{ github.event_name }} == 'pull_request' ]; then
echo 'features_to_test=${{ needs.find-features.outputs.changed-features }}' >> $GITHUB_OUTPUT
elif [ ${{ github.event_name }} == 'push' ]; then
elif [ ${{ github.event_name }} == 'push' ]; then
echo 'features_to_test=${{ needs.find-features.outputs.changed-features }}' >> $GITHUB_OUTPUT
elif [ ${{ github.event_name }} == 'workflow_dispatch' ]; then
elif [ ${{ github.event_name }} == 'workflow_dispatch' ]; then
if [ ${{ inputs.on_changes_only }} == 'true' ]; then
echo 'features_to_test=${{ needs.find-features.outputs.changed-features }}' >> $GITHUB_OUTPUT
else
echo 'features_to_test=${{ needs.find-features.outputs.all-features }}' >> $GITHUB_OUTPUT
fi
elif [ ${{ github.event_name }} == 'workflow_call' ]; then
elif [ ${{ github.event_name }} == 'workflow_call' ]; then
if [ ${{ inputs.on_changes_only }} == 'true' ]; then
echo 'features_to_test=${{ needs.find-features.outputs.changed-features }}' >> $GITHUB_OUTPUT
else
echo 'features_to_test=${{ needs.find-features.outputs.all-features }}' >> $GITHUB_OUTPUT
fi
fi
elif [ ${{ github.event_name }} == 'schedule' ]; then
echo 'features_to_test=${{ needs.find-features.outputs.all-features }}' >> $GITHUB_OUTPUT
fi
- name: binning
Expand Down
2 changes: 1 addition & 1 deletion src/pipx-package/devcontainer-feature.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "Pipx package",
"id": "pipx-package",
"version": "1.1.7",
"version": "1.1.8",
"description": "Installs a pipx package.",
"documentationURL": "http://github.com/devcontainers-contrib/features/tree/main/src/pipx-package",
"installsAfter": [
Expand Down
2 changes: 1 addition & 1 deletion src/pipx-package/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ install_via_pipx() {
injections_array_length="${#injections_array[@]}"

for ((i = 0; i < ${injections_array_length}; i++)); do
${pipx_bin} inject "$PACKAGE" --pip-args '--no-cache-dir --force-reinstall' -f "${injections_array[$i]}"
${pipx_bin} inject --pip-args '--no-cache-dir --force-reinstall' -f "$PACKAGE" "${injections_array[$i]}"
done

# cleaning pipx to save disk space
Expand Down

0 comments on commit 36b75c4

Please sign in to comment.