Skip to content

Commit

Permalink
Merge pull request #6 from zouyuxuan/main
Browse files Browse the repository at this point in the history
  • Loading branch information
wangeguo authored Jan 16, 2024
2 parents 4e2aa6e + 23e5f3f commit 57bf7d1
Show file tree
Hide file tree
Showing 4 changed files with 105 additions and 8 deletions.
13 changes: 13 additions & 0 deletions .github/pipeline-descriptor.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
github:
username: ${{ github.actor }}
token: ${{ secrets.AMP_BUILDPACKS_BOT_GITHUB_TOKEN }}

package:
repositories: ["ghcr.io/amp-buildpacks/scarb"]
register: false
registry_token: ${{ secrets.AMP_BUILDPACKS_BOT_GITHUB_TOKEN }}

docker_credentials:
- registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.AMP_BUILDPACKS_BOT_GITHUB_TOKEN }}
87 changes: 87 additions & 0 deletions .github/workflows/pb-update-pipeline.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,87 @@
name: Update Pipeline
"on":
push:
branches:
- main
paths:
- .github/pipeline-descriptor.yml
schedule:
- cron: 0 5 * * 1-5
workflow_dispatch: {}
jobs:
update:
name: Update Pipeline
runs-on:
- ubuntu-latest
steps:
- uses: actions/setup-go@v4
with:
go-version: "1.20"
- name: Install octo
run: |
#!/usr/bin/env bash
set -euo pipefail
go install -ldflags="-s -w" github.com/paketo-buildpacks/pipeline-builder/cmd/octo@latest
- uses: actions/checkout@v3
- name: Update Pipeline
id: pipeline
run: |
#!/usr/bin/env bash
set -euo pipefail
if [[ -f .github/pipeline-version ]]; then
OLD_VERSION=$(cat .github/pipeline-version)
else
OLD_VERSION="0.0.0"
fi
rm .github/workflows/pb-*.yml || true
octo --descriptor "${DESCRIPTOR}"
PAYLOAD=$(gh api /repos/paketo-buildpacks/pipeline-builder/releases/latest)
NEW_VERSION=$(jq -n -r --argjson PAYLOAD "${PAYLOAD}" '$PAYLOAD.name')
echo "${NEW_VERSION}" > .github/pipeline-version
RELEASE_NOTES=$(
gh api \
-F text="$(jq -n -r --argjson PAYLOAD "${PAYLOAD}" '$PAYLOAD.body')" \
-F mode="gfm" \
-F context="paketo-buildpacks/pipeline-builder" \
-X POST /markdown
)
git add .github/
git checkout -- .
echo "old-version=${OLD_VERSION}" >> "$GITHUB_OUTPUT"
echo "new-version=${NEW_VERSION}" >> "$GITHUB_OUTPUT"
DELIMITER=$(openssl rand -hex 16) # roughly the same entropy as uuid v4 used in https://github.com/actions/toolkit/blob/b36e70495fbee083eb20f600eafa9091d832577d/packages/core/src/file-command.ts#L28
printf "release-notes<<%s\n%s\n%s\n" "${DELIMITER}" "${RELEASE_NOTES}" "${DELIMITER}" >> "${GITHUB_OUTPUT}" # see https://docs.github.com/en/actions/using-workflows/workflow-commands-for-github-actions#multiline-strings
env:
DESCRIPTOR: .github/pipeline-descriptor.yml
GITHUB_TOKEN: ${{ secrets.AMP_BUILDPACKS_BOT_GITHUB_TOKEN }}
- uses: peter-evans/create-pull-request@v5
with:
author: ${{ github.actor }} <${{ github.actor }}@users.noreply.github.com>
body: |-
Bumps pipeline from `${{ steps.pipeline.outputs.old-version }}` to `${{ steps.pipeline.outputs.new-version }}`.
<details>
<summary>Release Notes</summary>
${{ steps.pipeline.outputs.release-notes }}
</details>
branch: update/pipeline
commit-message: |-
Bump pipeline from ${{ steps.pipeline.outputs.old-version }} to ${{ steps.pipeline.outputs.new-version }}
Bumps pipeline from ${{ steps.pipeline.outputs.old-version }} to ${{ steps.pipeline.outputs.new-version }}.
delete-branch: true
labels: semver:patch, type:task
signoff: true
title: Bump pipeline from ${{ steps.pipeline.outputs.old-version }} to ${{ steps.pipeline.outputs.new-version }}
token: ${{ secrets.AMP_BUILDPACKS_BOT_GITHUB_TOKEN }}
5 changes: 1 addition & 4 deletions scarb/build.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@ package scarb

import (
"fmt"
"log"

"github.com/buildpacks/libcnb"
"github.com/paketo-buildpacks/libpak"
"github.com/paketo-buildpacks/libpak/bard"
Expand All @@ -38,9 +36,8 @@ func (b Build) Build(context libcnb.BuildContext) (libcnb.BuildResult, error) {
}
libc, _ := config.Resolve("BP_SCARB_LIBC")

version, _ := config.Resolve("BP_LEO_VERSION")
version, _ := config.Resolve("BP_SCARB_VERSION")
buildDependency, _ := dependency.Resolve(fmt.Sprintf("scarb-%s", libc), version)
log.Printf("scarb dependency = %+v", buildDependency)

dc, err := libpak.NewDependencyCache(context)
if err != nil {
Expand Down
8 changes: 4 additions & 4 deletions scarb/scarb.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,17 @@ package scarb
import (
"bytes"
"fmt"
"os"
"path/filepath"
"strings"

"github.com/buildpacks/libcnb"
"github.com/paketo-buildpacks/libpak"
"github.com/paketo-buildpacks/libpak/bard"
"github.com/paketo-buildpacks/libpak/crush"
"github.com/paketo-buildpacks/libpak/effect"
"github.com/paketo-buildpacks/libpak/sbom"
"github.com/paketo-buildpacks/libpak/sherpa"

"os"
"path/filepath"
"strings"
)

type Scarb struct {
Expand Down

0 comments on commit 57bf7d1

Please sign in to comment.