Skip to content

Commit

Permalink
removing extra deps
Browse files Browse the repository at this point in the history
  • Loading branch information
nickzelei committed Sep 19, 2023
1 parent 6101bc3 commit 0bbbc60
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 13 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ jobs:
features:
- sqlc
baseImage:
# - debian:latest
# - ubuntu:latest
- debian:latest
- ubuntu:latest
- mcr.microsoft.com/devcontainers/base:ubuntu
- mcr.microsoft.com/devcontainers/base:debian
steps:
Expand Down
8 changes: 1 addition & 7 deletions src/sqlc/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ set -e

binary_names="sqlc"

source ./library_scripts.sh
. ./library_scripts.sh

# nanolayer is a cli utility which keeps container layers as small as possible
# source code: https://github.com/devcontainers-contrib/nanolayer
Expand All @@ -17,12 +17,6 @@ source ./library_scripts.sh
# of the script
ensure_nanolayer nanolayer_location "v0.5.3"

# fetch latest version if needed
if [ "${VERSION}" = "latest" ]; then
tag=$(curl -s https://api.github.com/repos/$ORG/$REPO/releases/latest | jq -r .tag_name)
export VERSION="${tag:1}"
fi

$nanolayer_location \
install \
devcontainer-feature \
Expand Down
8 changes: 4 additions & 4 deletions test/sqlc/sqlc_version.sh
Original file line number Diff line number Diff line change
@@ -1,30 +1,30 @@
#!/bin/bash

# This test file will be executed against an auto-generated devcontainer.json that
# includes the 'hello' Feature with no options.
# includes the 'sqlc' Feature with no options.
#
# For more information, see: https://github.com/devcontainers/cli/blob/main/docs/features/test.md
#
# Eg:
# {
# "image": "<..some-base-image...>",
# "features": {
# "hello": {}
# "sqlc": {}
# },
# "remoteUser": "root"
# }
#
# Thus, the value of all options will fall back to the default value in
# the Feature's 'devcontainer-feature.json'.
# For the 'hello' feature, that means the default favorite greeting is 'hey'.
# For the 'sqlc' feature, that means the default favorite greeting is 'hey'.
#
# These scripts are run as 'root' by default. Although that can be changed
# with the '--remote-user' flag.
#
# This test can be run with the following command:
#
# devcontainer features test \
# --features hello \
# --features sqlc \
# --remote-user root \
# --skip-scenarios \
# --base-image mcr.microsoft.com/devcontainers/base:ubuntu \
Expand Down

0 comments on commit 0bbbc60

Please sign in to comment.