Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/github_actions/actions/setup-pyth…
Browse files Browse the repository at this point in the history
…on-5
  • Loading branch information
ForestEckhardt authored Dec 14, 2023
2 parents 95ab3bf + a4f2285 commit c2dbd95
Show file tree
Hide file tree
Showing 6 changed files with 101 additions and 640 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/deploy-dev-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ jobs:
credentials_json: ${{ secrets.GCP_SA_KEY }}

- name: Setup GCloud
uses: google-github-actions/setup-gcloud@v1.1.1
uses: google-github-actions/setup-gcloud@v2.0.0
with:
export_default_credentials: true

Expand Down
4 changes: 2 additions & 2 deletions content/docs/howto/configuration.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ git clone https://github.com/paketo-buildpacks/samples
cd samples
{{< /code/copyable >}}

The [pack CLI][pack] is used throughout the examples. `pack` is just one of several Cloud Native Buildpack [platforms][platforms] than can execute builds with Paketo Buildpacks.
The [pack CLI][pack] is used throughout the examples. `pack` is just one of several Cloud Native Buildpack [platforms][platforms] that can execute builds with Paketo Buildpacks.

Examples assume that the [Paketo Base builder][base builder] is the default builder:
{{< code/copyable >}}
Expand Down Expand Up @@ -233,7 +233,7 @@ Paketo Buildpacks can be configured to route traffic through a proxy using the `

### Dependency Mappings

Paketo Buildpacks may download dependencies from the internet. For example, the Java Buildpack with download the BellSoft Liberica JRE will from the Liberica [github releases][liberica releases] by default.
Paketo Buildpacks may download dependencies from the internet. For example, the Java Buildpack will download the BellSoft Liberica JRE from the Liberica [github releases][liberica releases] by default.

If a dependency URI is inaccessible from the build environment, a [binding]({{< relref "#bindings" >}}) can be used to map a new URI to a given dependency. This allows organizations to upload a copies of vetted dependencies to an accessible location and provide developers and CI/CD pipelines with configuration pointing the buildpack at the accessible dependencies.

Expand Down
4 changes: 2 additions & 2 deletions content/docs/howto/dotnet-core.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ also compatible with the Paketo Full builder.**
The .NET Core Runtime and .NET Core ASP.NET Buildpacks allow you to specify a
version of the .NET Core Runtime and ASP.NET to use during deployment. This
version can be specified in several ways including through a
`runtimeconfig.json`, MSBuild Project file, or build-time environment
`runtimeconfig.json`, MSBuild Project file (e.g. `*.csproj`, `*.fsproj`, or `*.vbproj`), or build-time environment
variables. When specifying a version of the .NET Core Runtime and ASP.NET, you
must choose a version that is available within these buildpacks. These versions
can be found in the [.NET Core Runtime release
Expand Down Expand Up @@ -92,7 +92,7 @@ Core Runtime v2.1.14 when deploying your app, include the values below in your

### Using a Project file

If you are using a Project file (e.g. `*.csproj`, `*.fsproj`, or `*.vbproj`), you can specify
If you are using an MSBuild Project file (e.g. `*.csproj`, `*.fsproj`, or `*.vbproj`), you can specify
the .NET Core Runtime version within that file. To configure the buildpack to
use .NET Core Runtime v2.1.14 when deploying your app, include the values below
in your Project file:
Expand Down
Loading

0 comments on commit c2dbd95

Please sign in to comment.