diff --git a/CHANGELOG.md b/CHANGELOG.md index 899c08e465..592474905d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,7 +10,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - [Unreleased](#unreleased) - - [X.Y.Z: Go builder](#xyz-go-builder) +- [1.7.0](#170) + - [1.7.0: Go builder](#170-go-builder) - [v1.6.0](#v160) - [Summary of changes](#summary-of-changes) - [Go builder](#go-builder) @@ -87,7 +88,11 @@ Use the format "X.Y.Z: Go builder" etc. for format headers to avoid header name duplication." --> -### X.Y.Z: Go builder +## 1.7.0 + +This release includes the first beta release of the [Container-based builder](https://github.com/slsa-framework/slsa-github-generator/tree/v1.7.0/internal/builders/docker). The Container-based builder provides a GitHub Actions reusable workflow that can be used to invoke a container image with a user-specified command to generate an artifact and SLSA Build L3 compliant provenance. + +### 1.7.0: Go builder - **Added**: A new [go-version-file](https://github.com/slsa-framework/slsa-github-generator/blob/main/internal/builders/go/README.md#workflow-inputs) diff --git a/README.md b/README.md index c6202d39a3..a5827449ec 100644 --- a/README.md +++ b/README.md @@ -119,7 +119,7 @@ This repository hosts the following builders: 2. [Node.js Builder SLSA Level 3](internal/builders/nodejs/README.md). **Status**: [Beta since v1.6.0](https://github.com/slsa-framework/slsa-github-generator/milestone/8). [Expected GA release Jun 2023](https://github.com/slsa-framework/slsa-github-generator/milestone/17). -3. _Container-based Builder SLSA Level 3_. **Status**: [WIP, expected release by Jun 2023](https://github.com/slsa-framework/slsa-github-generator/milestone/4). This builder will build arbitrary artifacts by executing a user-supplied container image. +3. _Container-based Builder SLSA Level 3_. **Status**: [Beta release since v1.7.0](https://github.com/slsa-framework/slsa-github-generator/milestone/4). This builder will build arbitrary artifacts by executing a user-supplied container image. 4. _Container Builder SLSA Level 3_. **Status**: [WIP](https://github.com/slsa-framework/slsa-github-generator/milestone/5). This builder will build your container image and generate provenance. The generated provenance will be compatible with [cosign](https://github.com/sigstore/cosign)'s attestation format. diff --git a/internal/builders/docker/README.md b/internal/builders/docker/README.md index 9b9018373d..dcf14e2030 100644 --- a/internal/builders/docker/README.md +++ b/internal/builders/docker/README.md @@ -15,16 +15,8 @@ from the [generic artifact workflow](../generic/README.md) as it performs the build as well as generates the provenance. This workflow uses a distinct build type that provides the full details on the build process. -**NOTE**: This workflow is currently pending -[release](https://github.com/slsa-framework/slsa-github-generator/milestone/4). -For stable testing, use the following reusable workflow that uses the same -inputs and outputs documented below. - -```yaml -uses: slsa-framework/slsa-github-generator/.github/workflows/builder_docker-based_slsa3.yml@v1.6.0 -``` - -This is compatible with the `slsa-verifier` version 2.6.x. +**NOTE**: This workflow is currently in +[beta testing](https://github.com/slsa-framework/slsa-github-generator/milestone/4). ---