Skip to content
This repository was archived by the owner on May 20, 2025. It is now read-only.

Commit c7d1114

Browse files
committed
Relocate stembuild to a subdirectory
This work is in preparation for consolidating this repo into bosh-windows-stemcell-builder.
1 parent de14446 commit c7d1114

File tree

1,943 files changed

+193
-209
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,943 files changed

+193
-209
lines changed

.github/workflows/go.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,10 @@ jobs:
1717
- name: Provide `StemcellAutomation.zip` for `go:embed` consumption in `assets` package
1818
run: |
1919
make generate-fake-stemcell-automation
20+
working-directory: stembuild
2021
- uses: golangci/golangci-lint-action@v7
22+
with:
23+
working-directory: stembuild
2124
test:
2225
strategy:
2326
matrix:
@@ -27,10 +30,12 @@ jobs:
2730
- uses: actions/checkout@v4
2831
- uses: actions/setup-go@v5
2932
with:
30-
go-version-file: go.mod
33+
go-version-file: stembuild/go.mod
3134
- name: Provide `StemcellAutomation.zip` for `go:embed` consumption in `assets` package
3235
run: |
3336
make generate-fake-stemcell-automation
37+
working-directory: stembuild
3438
# skip specs for "packager", "ovftool" because "ovftool" be installed
3539
- run: |
3640
go run github.com/onsi/ginkgo/v2/ginkgo run -r --keep-going --randomize-all --randomize-suites --skip-package integration,iaas_cli,ovftool,packager
41+
working-directory: stembuild

.gitignore

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,8 @@
11
.DS_Store
22
.idea
33
.envrc
4-
stembuild
5-
stembuild.exe
6-
StemcellAutomation.zip
7-
LGPO.zip
8-
gordiff
9-
gordiff.exe
10-
temp
11-
rdiff/*.c
12-
rdiff/*.h
13-
test/data/expected.vmdk.lck/*
14-
version/version.go
15-
version/version
16-
**.ova
17-
**/.envrc
18-
integration/construct/construct-integration*/**
4+
5+
stembuild/stembuild
6+
stembuild/stembuild.exe
7+
stembuild/StemcellAutomation.zip
8+
stembuild/LGPO.zip

assets/local/.gitignore

Lines changed: 0 additions & 1 deletion
This file was deleted.

bin/build-stemcell-automation-zip.sh

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,21 @@ set -eu -o pipefail
44
ROOT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )/.." && pwd )"
55
STEMCELL_AUTOMATION_PS1=$(ls "${ROOT_DIR}"/stemcell-automation/*ps1 | grep -iv Test)
66

7-
: ${OPENSSH_ZIP?"Please see README.md on where to obtain this."}
8-
: ${BOSH_PSMODULES_ZIP?"Please see README.md on where to obtain this."}
9-
: ${AGENT_ZIP?"Please see README.md on how to construct this."}
10-
: ${DEPS_JSON?"Please see README.md on how to construct this."}
7+
: "${OPENSSH_ZIP?"Please see README.md on where to obtain this."}"
8+
: "${BOSH_PSMODULES_ZIP?"Please see README.md on where to obtain this."}"
9+
: "${AGENT_ZIP?"Please see README.md on how to construct this."}"
10+
: "${DEPS_JSON?"Please see README.md on how to construct this."}"
1111

1212
TEMP_DIR=$(mktemp -d)
1313

1414
cp "${OPENSSH_ZIP}" "${TEMP_DIR}/OpenSSH-Win64.zip"
1515
cp "${BOSH_PSMODULES_ZIP}" "${TEMP_DIR}/bosh-psmodules.zip"
1616
cp "${AGENT_ZIP}" "${TEMP_DIR}/agent.zip"
1717
cp "${DEPS_JSON}" "${TEMP_DIR}/deps.json"
18-
cp ${STEMCELL_AUTOMATION_PS1} "$TEMP_DIR"
18+
cp "${STEMCELL_AUTOMATION_PS1}" "${TEMP_DIR}"
1919

20-
rm -f "${ROOT_DIR}/assets/StemcellAutomation.zip"
20+
rm -f "${ROOT_DIR}/stembuild/assets/StemcellAutomation.zip"
2121

22-
zip -rj "${ROOT_DIR}/assets/StemcellAutomation.zip" "$TEMP_DIR"
22+
zip -rj "${ROOT_DIR}/stembuild/assets/StemcellAutomation.zip" "${TEMP_DIR}"
2323

24-
rm -r "$TEMP_DIR"
24+
rm -r "${TEMP_DIR}"

Makefile renamed to stembuild/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
GOSRC = $(shell find . -name "*.go" ! -name "*test.go" ! -name "*fake*" ! -path "./integration/*")
22
STEMCELL_VERSION = $(shell echo "$${STEMBUILD_VERSION}")
3-
LD_FLAGS = "-w -s -X github.com/cloudfoundry/stembuild/version.Version=${STEMCELL_VERSION}"
3+
LD_FLAGS = "-w -s -X github.gwd.broadcom.net/TNZ/bosh-windows-stemcell-builder/stembuild/version.Version=${STEMCELL_VERSION}"
44

55
ifeq ($(OS),Windows_NT)
66
COMMAND = out/stembuild.exe
@@ -41,10 +41,10 @@ integration-badger : generate-fake-stemcell-automation
4141
generate-fake-stemcell-automation:
4242
$(CP) integration/construct/assets/StemcellAutomation.zip assets/
4343

44-
out/stembuild : assets/StemcellAutomation.zip $(GOSRC)
44+
out/stembuild : assets $(GOSRC)
4545
CGO_ENABLED=0 go build -o $(COMMAND) -ldflags $(LD_FLAGS) .
4646

47-
out/stembuild.exe : assets/StemcellAutomation.zip $(GOSRC)
47+
out/stembuild.exe : assets $(GOSRC)
4848
GOOS=windows CGO_ENABLED=0 go build -o out/stembuild.exe -ldflags $(LD_FLAGS) .
4949

5050
test : units

README.md renamed to stembuild/README.md

Lines changed: 2 additions & 2 deletions

0 commit comments

Comments
 (0)