Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/dependency-deprecation-reminder.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
- name: Checkout
uses: actions/checkout@v3
with:
ref: develop
ref: master

- name: Get deprecations
id: deprecations
Expand Down
101 changes: 0 additions & 101 deletions .github/workflows/release-reminder.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/synchronize-labels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Synchronize Labels
on:
push:
branches:
- develop
- master
paths:
- .github/labels.yml
workflow_dispatch: {}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Test Pull Request
on:
pull_request:
branches:
- develop
- master

jobs:
unit:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/update-github-config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
uses: actions/checkout@v4
with:
token: ${{ secrets.CF_BOT_GITHUB_TOKEN }}
ref: develop
ref: master

- name: Checkout github-config
uses: actions/checkout@v4
Expand Down Expand Up @@ -61,4 +61,4 @@ jobs:
token: ${{ secrets.CF_BOT_GITHUB_TOKEN }}
title: "Updates github-config"
branch: automation/github-config/update
base: develop
base: master
9 changes: 8 additions & 1 deletion scripts/.util/tools.sh
Original file line number Diff line number Diff line change
Expand Up @@ -148,10 +148,17 @@ function util::tools::cf::install() {
exit 1
esac

# Check if cf already exists in the target directory or system PATH
if [[ -f "${dir}/cf" ]] || command -v cf >/dev/null 2>&1; then
util::print::title "CF CLI already installed (using system version)"
cf version
return 0
fi

if [[ ! -f "${dir}/cf" ]]; then
util::print::title "Installing cf"

curl "https://packages.cloudfoundry.org/stable?release=${os}-binary&version=6.49.0&source=github-rel" \
curl "https://packages.cloudfoundry.org/stable?release=${os}-binary&source=github-rel" \
--silent \
--location \
--output /tmp/cf.tar.gz
Expand Down
1 change: 1 addition & 0 deletions scripts/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ function main() {
output="${output}.exe"
fi

rm -f "${output}"
CGO_ENABLED=0 \
GOOS="${os}" \
go build \
Expand Down
17 changes: 10 additions & 7 deletions scripts/install_go.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,24 +5,27 @@ set -u
set -o pipefail

function main() {
if [[ "${CF_STACK:-}" != "cflinuxfs3" && "${CF_STACK:-}" != "cflinuxfs4" ]]; then
if [[ "${CF_STACK:-}" != "cflinuxfs4" && "${CF_STACK:-}" != "cflinuxfs5" ]]; then
echo " **ERROR** Unsupported stack"
echo " See https://docs.cloudfoundry.org/devguide/deploy-apps/stacks.html for more info"
exit 1
fi

local version expected_sha dir
version="1.22.5"
expected_sha="ddb12ede43eef214c7d4376761bd5ba6297d5fa7a06d5635ea3e7a276b3db730"
version="1.25.6"
expected_sha="0ed64e3b9cb9b1c2ec57880dae2427b0ee2676f2ae2fb53c2e1bb838c500f9fb"
dir="/tmp/go${version}"

mkdir -p "${dir}"

if [[ ! -f "${dir}/bin/go" ]]; then
local url
# TODO: use exact stack based dep, after go buildpack has cflinuxfs4 support
#url="https://buildpacks.cloudfoundry.org/dependencies/go/go_${version}_linux_x64_${CF_STACK}_${expected_sha:0:8}.tgz"
url="https://buildpacks.cloudfoundry.org/dependencies/go/go_${version}_linux_x64_cflinuxfs3_${expected_sha:0:8}.tgz"
local url stack_for_download
# Use cflinuxfs4 binary for cflinuxfs5 (compatible)
stack_for_download="${CF_STACK}"
if [[ "${CF_STACK}" == "cflinuxfs5" ]]; then
stack_for_download="cflinuxfs4"
fi
url="https://buildpacks.cloudfoundry.org/dependencies/go/go_${version}_linux_x64_${stack_for_download}_${expected_sha:0:8}.tgz"

echo "-----> Download go ${version}"
curl "${url}" \
Expand Down