Skip to content

Commit

Permalink
2024-01-16 Features Release (#37)
Browse files Browse the repository at this point in the history
- chore(deps): update actions/download-artifact action to v4 (#19)
- feat(Tools): Adds the Subversion client to the Dev Container (#35)
- feat(Tools): Adds the MySQL/MariaDB client (#36)
  • Loading branch information
timnolte authored Jan 17, 2024
2 parents df15c26 + 1feb26a commit 65277ed
Show file tree
Hide file tree
Showing 6 changed files with 50 additions and 2 deletions.
4 changes: 4 additions & 0 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
},
"ghcr.io/devcontainers/features/git:1": {},
"ghcr.io/devcontainers/features/github-cli:1": {},
"./local-features/mysql-client": "latest",
"./local-features/subversion": "latest",
"./local-features/wp-cli": "latest",
"./local-features/php-cli-xdebug": "latest"
},
Expand All @@ -28,6 +30,8 @@
"ghcr.io/devcontainers/features/docker-in-docker",
"ghcr.io/devcontainers/features/git",
"ghcr.io/devcontainers/features/github-cli",
"./local-features/mysql-client",
"./local-features/subversion",
"./local-features/wp-cli",
"./local-features/php-cli-xdebug"
]
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"Id": "mysql-client",
"name": "Install the MySQL/MariaDB client",
"install": {
"app": "",
"file": "install.sh"
}
}
14 changes: 14 additions & 0 deletions .devcontainer/local-features/mysql-client/install.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
#!/usr/bin/env bash

set -eux

export DEBIAN_FRONTEND=noninteractive

# Install the MySQL/MariaDB client.
if [ ! -f /usr/bin/mysql ]; then
echo "Installing MySQL/MariaDB client..."
sudo apt-get update -y --no-install-recommends
sudo apt-get install -y --no-install-recommends default-mysql-client
fi

echo "Done!"
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"Id": "subversion",
"name": "Install the Subversion CLI",
"install": {
"app": "",
"file": "install.sh"
}
}
14 changes: 14 additions & 0 deletions .devcontainer/local-features/subversion/install.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
#!/usr/bin/env bash

set -eux

export DEBIAN_FRONTEND=noninteractive

# Install the Subversion CLI.
if [ ! -f /usr/bin/svn ]; then
echo "Installing Subversion CLI..."
sudo apt-get update -y --no-install-recommends
sudo apt-get install -y --no-install-recommends subversion
fi

echo "Done!"
4 changes: 2 additions & 2 deletions .github/workflows/test-build-cli.yml
Original file line number Diff line number Diff line change
Expand Up @@ -110,14 +110,14 @@ jobs:
steps:
# https://github.com/marketplace/actions/download-a-build-artifact
- name: Download Digests - amd64
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: ${{ env.PACKAGE }}-php-${{ matrix.PHP_VERSION }}-node-${{ matrix.NODE_VERSION }}-amd64
path: /tmp/${{ env.PACKAGE }}/

# https://github.com/marketplace/actions/download-a-build-artifact
- name: Download Digests - arm64
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: ${{ env.PACKAGE }}-php-${{ matrix.PHP_VERSION }}-node-${{ matrix.NODE_VERSION }}-arm64
path: /tmp/${{ env.PACKAGE }}/
Expand Down

0 comments on commit 65277ed

Please sign in to comment.