update to 3.6.7

initializ-buildpacks · May 24, 2024 · ccab800 · ccab800
1 parent 940fdda
commit ccab800
Show file tree

Hide file tree

Showing 29 changed files with 271 additions and 545 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -4,8 +4,6 @@ updates:
       directory: /
       schedule:
         interval: daily
-      ignore:
-        - dependency-name: github.com/onsi/gomega
       labels:
         - semver:patch
         - type:dependency-upgrade
diff --git a/.github/pipeline-descriptor.yml b/.github/pipeline-descriptor.yml
@@ -1,26 +1,20 @@
 github:
-  username: ${{ secrets.JAVA_GITHUB_USERNAME }}
-  token:    ${{ secrets.PAKETO_BOT_GITHUB_TOKEN }}
-
-helpers:
-  "bin/helper": "$GOMOD/cmd/helper"
+  username: ${{ secrets.GITHUB_USERNAME }}
+  token:    ${{ secrets.PAT }}
 
 codeowners:
 - path:  "*"
-  owner: "@paketo-buildpacks/java-maintainers"
+  owner: "@initializ-buildpacks/java-maintainers"
 
 package:
-  repositories:   ["docker.io/paketobuildpacks/datadog","gcr.io/paketo-buildpacks/datadog"]
+  repositories:   ["docker.io/initializbuildpacks/datadog"]
   register:       true
-  registry_token: ${{ secrets.PAKETO_BOT_GITHUB_TOKEN }}
+  registry_token: ${{ secrets.PAT }}
 
 docker_credentials:
-- registry: gcr.io
-  username: _json_key
-  password: ${{ secrets.GCR_PUSH_BOT_JSON_KEY }}
 - registry: docker.io
-  username: ${{ secrets.PAKETO_BUILDPACKS_DOCKERHUB_USERNAME }}
-  password: ${{ secrets.PAKETO_BUILDPACKS_DOCKERHUB_PASSWORD }}
+  username: ${{ secrets.INITIALIZ_BUILDPACKS_DOCKERHUB_USERNAME }}
+  password: ${{ secrets.INITIALIZ_BUILDPACKS_DOCKERHUB_PASSWORD }}
 
 dependencies:
 - id:   datadog-agent-java
@@ -29,7 +23,6 @@ dependencies:
     uri:         https://repo1.maven.org/maven2
     group_id:    com.datadoghq
     artifact_id: dd-java-agent
-    source_classifier: sources
 - id:   datadog-agent-nodejs
   uses: docker://ghcr.io/paketo-buildpacks/actions/npm-dependency:main
   with:

diff --git a/.github/pipeline-version b/.github/pipeline-version
@@ -1 +1 @@
-1.37.5
+1.30.0
diff --git a/.github/workflows/pb-create-package.yml b/.github/workflows/pb-create-package.yml
@@ -11,39 +11,59 @@ jobs:
         steps:
             - name: Docker login docker.io
               if: ${{ (github.event_name != 'pull_request' || ! github.event.pull_request.head.repo.fork) && (github.actor != 'dependabot[bot]') }}
-              uses: docker/login-action@v3
+              uses: docker/login-action@v2
               with:
                 password: ${{ secrets.INITIALIZ_BUILDPACKS_DOCKERHUB_PASSWORD }}
                 registry: docker.io
                 username: ${{ secrets.INITIALIZ_BUILDPACKS_DOCKERHUB_USERNAME }}
-            - uses: actions/setup-go@v5
+            - uses: actions/setup-go@v3
               with:
-                go-version: "1.20"
+                go-version: "1.18"
             - name: Install create-package
               run: |
                 #!/usr/bin/env bash
 
                 set -euo pipefail
 
                 go install -ldflags="-s -w" github.com/paketo-buildpacks/libpak/cmd/create-package@latest
-            - uses: buildpacks/github-actions/[email protected]
-              with:
-                crane-version: 0.19.0
-                yj-version: 5.1.0
+            - name: Install crane
+              run: |
+                #!/usr/bin/env bash
+
+                set -euo pipefail
+
+                echo "Installing crane ${CRANE_VERSION}"
+
+                mkdir -p "${HOME}"/bin
+                echo "${HOME}/bin" >> "${GITHUB_PATH}"
+
+                curl \
+                  --show-error \
+                  --silent \
+                  --location \
+                  "https://github.com/google/go-containerregistry/releases/download/v${CRANE_VERSION}/go-containerregistry_Linux_x86_64.tar.gz" \
+                | tar -C "${HOME}/bin" -xz crane
+              env:
+                CRANE_VERSION: 0.8.0
             - name: Install pack
               run: |
                 #!/usr/bin/env bash
-                # this is coming from a copy of https://github.com/buildpacks/pack/actions/runs/8118576298 stored on box
-                # TODO to revisit when the official one is out
+
                 set -euo pipefail
 
-                echo "Installing pack experimental"
+                echo "Installing pack ${PACK_VERSION}"
 
                 mkdir -p "${HOME}"/bin
                 echo "${HOME}/bin" >> "${GITHUB_PATH}"
 
-                curl -L "https://ent.box.com/shared/static/j4d1bfe9uk1sb0i7zjvci0md9xmy41u4" -o ${HOME}/bin/pack
-                chmod +x "${HOME}"/bin/pack
+                curl \
+                  --location \
+                  --show-error \
+                  --silent \
+                  "https://github.com/buildpacks/pack/releases/download/v${PACK_VERSION}/pack-v${PACK_VERSION}-linux.tgz" \
+                | tar -C "${HOME}"/bin -xz pack
+              env:
+                PACK_VERSION: 0.27.0
             - name: Enable pack Experimental
               if: ${{ false }}
               run: |
@@ -55,9 +75,9 @@ jobs:
 
                 mkdir -p "${HOME}"/.pack
                 echo "experimental = true" >> "${HOME}"/.pack/config.toml
-            - uses: actions/checkout@v4
+            - uses: actions/checkout@v3
             - if: ${{ false }}
-              uses: actions/cache@v4
+              uses: actions/cache@v3
               with:
                 key: ${{ runner.os }}-go-${{ hashFiles('**/buildpack.toml', '**/package.toml') }}
                 path: |-
@@ -71,8 +91,8 @@ jobs:
 
                 set -euo pipefail
 
-                if [[ ${GITHUB_REF:-} != "refs/"* ]]; then
-                  echo "GITHUB_REF set to [${GITHUB_REF:-}], but that is unexpected. It should start with 'refs/*'"
+                if [ -z "${GITHUB_REF+set}" ]; then
+                  echo "GITHUB_REF set to [${GITHUB_REF-<unset>}], but should never be empty or unset"
                   exit 255
                 fi
 
@@ -101,32 +121,23 @@ jobs:
 
                 set -euo pipefail
 
-                # With Go 1.20, we need to set this so that we produce statically compiled binaries
-                #
-                # Starting with Go 1.20, Go will produce binaries that are dynamically linked against libc
-                #   which can cause compatibility issues. The compiler links against libc on the build system
-                #   but that may be newer than on the stacks we support.
-                export CGO_ENABLED=0
-
                 if [[ "${INCLUDE_DEPENDENCIES}" == "true" ]]; then
                   create-package \
-                    --source "${SOURCE_PATH:-.}" \
+                    --source ${SOURCE_PATH:-.} \
                     --cache-location "${HOME}"/carton-cache \
                     --destination "${HOME}"/buildpack \
                     --include-dependencies \
                     --version "${VERSION}"
                 else
                   create-package \
-                    --source "${SOURCE_PATH:-.}" \
+                    --source ${SOURCE_PATH:-.} \
                     --destination "${HOME}"/buildpack \
                     --version "${VERSION}"
                 fi
 
-                PACKAGE_FILE="${SOURCE_PATH:-.}/package.toml"
-                if [ -f "${PACKAGE_FILE}" ]; then
-                  cp "${PACKAGE_FILE}" "${HOME}/buildpack/package.toml"
-                  printf '[buildpack]\nuri = "%s"\n\n[platform]\nos = "%s"\n' "${HOME}/buildpack" "${OS}" >> "${HOME}/buildpack/package.toml"
-                fi
+                PACKAGE_FILE=${SOURCE_PATH:-.}/package.toml
+                [[ -e ${PACKAGE_FILE} ]] && cp ${PACKAGE_FILE} "${HOME}"/package.toml
+                printf '[buildpack]\nuri = "%s"\n\n[platform]\nos = "%s"\n' "${HOME}"/buildpack "${OS}" >> "${HOME}"/package.toml
               env:
                 INCLUDE_DEPENDENCIES: "false"
                 OS: linux
@@ -139,23 +150,15 @@ jobs:
 
                 set -euo pipefail
 
-                COMPILED_BUILDPACK="${HOME}/buildpack"
-
-                # create-package puts the buildpack here, we need to run from that directory
-                #   for component buildpacks so that pack doesn't need a package.toml
-                cd "${COMPILED_BUILDPACK}"
-                CONFIG=""
-                if [ -f "${COMPILED_BUILDPACK}/package.toml" ]; then
-                  CONFIG="--config ${COMPILED_BUILDPACK}/package.toml"
-                fi
 
                 PACKAGE_LIST=($PACKAGES)
                 # Extract first repo (Docker Hub) as the main to package & register
                 PACKAGE=${PACKAGE_LIST[0]}
 
                 if [[ "${PUBLISH:-x}" == "true" ]]; then
-                  pack -v buildpack package \
-                    "${PACKAGE}:${VERSION}" ${CONFIG} \
+                  pack buildpack package \
+                    "${PACKAGE}:${VERSION}" \
+                    --config "${HOME}"/package.toml \
                     --publish
 
                   if [[ -n ${VERSION_MINOR:-} && -n ${VERSION_MAJOR:-} ]]; then
@@ -179,12 +182,13 @@ jobs:
                     done
 
                 else
-                  pack -v buildpack package \
-                    "${PACKAGE}:${VERSION}" ${CONFIG} \
+                  pack buildpack package \
+                    "${PACKAGE}:${VERSION}" \
+                    --config "${HOME}"/package.toml \
                     --format "${FORMAT}"
                 fi
               env:
-                PACKAGES: docker.io/initializbuildpacks/datadog
+                PACKAGES: docker.io/paketobuildpacks/datadog
                 PUBLISH: "true"
                 VERSION: ${{ steps.version.outputs.version }}
                 VERSION_MAJOR: ${{ steps.version.outputs.version-major }}
@@ -212,7 +216,7 @@ jobs:
                 DIGEST: ${{ steps.package.outputs.digest }}
                 GITHUB_TOKEN: ${{ secrets.PAT }}
             - if: ${{ true }}
-              uses: docker://ghcr.io/buildpacks/actions/registry/request-add-entry:5.5.3
+              uses: docker://ghcr.io/buildpacks/actions/registry/request-add-entry:4.0.1
               with:
                 address: docker.io/initializbuildpacks/datadog@${{ steps.package.outputs.digest }}
                 id: initializ-buildpacks/datadog

diff --git a/.github/workflows/pb-minimal-labels.yml b/.github/workflows/pb-minimal-labels.yml
@@ -12,7 +12,7 @@ jobs:
         runs-on:
             - ubuntu-latest
         steps:
-            - uses: mheap/github-action-required-labels@v5
+            - uses: mheap/github-action-required-labels@v3
               with:
                 count: 1
                 labels: semver:major, semver:minor, semver:patch
@@ -22,7 +22,7 @@ jobs:
         runs-on:
             - ubuntu-latest
         steps:
-            - uses: mheap/github-action-required-labels@v5
+            - uses: mheap/github-action-required-labels@v3
               with:
                 count: 1
                 labels: type:bug, type:dependency-upgrade, type:documentation, type:enhancement, type:question, type:task

diff --git a/.github/workflows/pb-synchronize-labels.yml b/.github/workflows/pb-synchronize-labels.yml
@@ -11,7 +11,7 @@ jobs:
         runs-on:
             - ubuntu-latest
         steps:
-            - uses: actions/checkout@v4
+            - uses: actions/checkout@v3
             - uses: micnncim/action-label-syncer@v1
               env:
                 GITHUB_TOKEN: ${{ secrets.PAT }}