From 0bbbc6091f115b9e93ac2b960276ae1fdac33b42 Mon Sep 17 00:00:00 2001 From: Nick Z <2420177+nickzelei@users.noreply.github.com> Date: Tue, 19 Sep 2023 00:37:04 +0000 Subject: [PATCH] removing extra deps --- .github/workflows/test.yaml | 4 ++-- src/sqlc/install.sh | 8 +------- test/sqlc/sqlc_version.sh | 8 ++++---- 3 files changed, 7 insertions(+), 13 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index ff80a0a..0052b37 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -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: diff --git a/src/sqlc/install.sh b/src/sqlc/install.sh index 2c5aecb..24bdc66 100644 --- a/src/sqlc/install.sh +++ b/src/sqlc/install.sh @@ -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 @@ -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 \ diff --git a/test/sqlc/sqlc_version.sh b/test/sqlc/sqlc_version.sh index 3de2029..a808fdd 100644 --- a/test/sqlc/sqlc_version.sh +++ b/test/sqlc/sqlc_version.sh @@ -1,7 +1,7 @@ #!/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 # @@ -9,14 +9,14 @@ # { # "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. @@ -24,7 +24,7 @@ # 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 \