Updates github-config

.github/workflows/create-draft-release.yml

@@ -53,9 +53,8 @@ jobs:
     - name: Checkout
       uses: actions/checkout@v3
     - name: Run Integration Tests
-      run: ./scripts/integration.sh --use-token --builder ${{ matrix.builder }}
+      run: ./scripts/integration.sh --builder ${{ matrix.builder }} --token ${{ github.token }}
       env:
-        GIT_TOKEN: ${{ github.token }}
         TMPDIR: "${{ runner.temp }}"
 
   release:

.github/workflows/test-pull-request.yml

@@ -55,9 +55,8 @@ jobs:
       uses: actions/checkout@v3
 
     - name: Run Integration Tests
-      run: ./scripts/integration.sh --use-token --builder ${{ matrix.builder }}
+      run: ./scripts/integration.sh --builder ${{ matrix.builder }} --token ${{ github.token }}
       env:
-        GIT_TOKEN: ${{ github.token }}
         TMPDIR: "${{ runner.temp }}"
 
   roundup:

scripts/.util/tools.json

@@ -1,5 +1,5 @@
 {
-  "createpackage": "v1.67.2",
-  "jam": "v2.6.0",
-  "pack": "v0.31.0"
+  "createpackage": "v1.69.1",
+  "jam": "v2.7.1",
+  "pack": "v0.33.2"
 }

scripts/.util/tools.sh

@@ -135,6 +135,13 @@ function util::tools::pack::install() {
 
     version="$(jq -r .pack "$(dirname "${BASH_SOURCE[0]}")/tools.json")"
 
+    local pack_config_enable_experimental
+    if [ -f "$(dirname "${BASH_SOURCE[0]}")/../options.json" ]; then
+      pack_config_enable_experimental="$(jq -r .pack_config_enable_experimental "$(dirname "${BASH_SOURCE[0]}")/../options.json")"
+    else
+      pack_config_enable_experimental="false"
+    fi
+
     tmp_location="/tmp/pack.tgz"
     curl_args=(
       "--fail"
@@ -158,6 +165,10 @@ function util::tools::pack::install() {
     tar xzf "${tmp_location}" -C "${dir}"
     chmod +x "${dir}/pack"
 
+    if [[ "${pack_config_enable_experimental}" == "true" ]]; then
+      "${dir}"/pack config experimental true
+    fi
+
     rm "${tmp_location}"
   else
     util::print::info "Using pack $("${dir}"/pack version)"

scripts/build.sh

@@ -56,7 +56,15 @@ function run::build() {
 
       echo "Success!"
 
-      for name in detect build; do
+      names=("detect")
+
+      if [ -f "extension.toml" ]; then
+        names+=("generate")
+      else
+        names+=("build")
+      fi
+
+      for name in "${names[@]}"; do
         printf "%s" "Linking ${name}... "
 
         ln -sf "run" "${name}"
@@ -73,16 +81,20 @@ function cmd::build() {
     for src in "${BUILDPACKDIR}"/cmd/*; do
       name="$(basename "${src}")"
 
-      printf "%s" "Building ${name}... "
+      if [[ -f "${src}/main.go" ]]; then
+        printf "%s" "Building ${name}... "
 
-      GOOS="linux" \
-      CGO_ENABLED=0 \
-        go build \
-          -ldflags="-s -w" \
-          -o "${BUILDPACKDIR}/bin/${name}" \
-            "${src}/main.go"
+        GOOS="linux" \
+        CGO_ENABLED=0 \
+          go build \
+            -ldflags="-s -w" \
+            -o "${BUILDPACKDIR}/bin/${name}" \
+              "${src}/main.go"
 
-      echo "Success!"
+        echo "Success!"
+      else
+        printf "%s" "Skipping ${name}... "
+      fi
     done
   fi
 }

scripts/integration.sh

@@ -12,22 +12,16 @@ source "${PROGDIR}/.util/tools.sh"
 # shellcheck source=SCRIPTDIR/.util/print.sh
 source "${PROGDIR}/.util/print.sh"
 
-# shellcheck source=SCRIPTDIR/.util/git.sh
-source "${PROGDIR}/.util/git.sh"
-
 # shellcheck source=SCRIPTDIR/.util/builders.sh
 source "${PROGDIR}/.util/builders.sh"
 
 function main() {
-  local builderArray
+  local builderArray token
   builderArray=()
+  token=""
+
   while [[ "${#}" != 0 ]]; do
     case "${1}" in
-      --use-token|-t)
-        shift 1
-        token::fetch
-        ;;
-
       --help|-h)
         shift 1
         usage
@@ -39,6 +33,11 @@ function main() {
         shift 2
         ;;
 
+      --token|-t)
+        token="${2}"
+        shift 2
+        ;;
+
       "")
         # skip if the argument is empty
         shift 1
@@ -53,7 +52,7 @@ function main() {
       util::print::warn "** WARNING  No Integration tests **"
   fi
 
-  tools::install "${GIT_TOKEN:-}"
+  tools::install "${token}"
 
   if [ ${#builderArray[@]} -eq 0 ]; then
     util::print::title "No builders provided. Finding builders in integration.json..."
@@ -93,9 +92,9 @@ Runs the integration test suite.
 
 OPTIONS
   --help           -h         prints the command usage
-  --use-token      -t         use GIT_TOKEN from lastpass
   --builder <name> -b <name>  sets the name of the builder(s) that are pulled / used for testing.
                               Defaults to "builders" array in integration.json, if present.
+  --token <token>             Token used to download assets from GitHub (e.g. jam, pack, etc) (optional)
 USAGE
 }
 
@@ -144,11 +143,6 @@ function builder_images::pull() {
   docker pull "${lifecycle_image}"
 }
 
-function token::fetch() {
-  GIT_TOKEN="$(util::git::token::fetch)"
-  export GIT_TOKEN
-}
-
 function tests::run() {
   util::print::title "Run Buildpack Runtime Integration Tests"
   util::print::info "Using ${1} as builder..."