Skip to content

Commit 021f2d4

Browse files
chore(core): Removes go.work.sum and ignore it (#1911)
### Proposed Changes * This should reduce the number of spurious merge conflicts. ### Checklist - [ ] I have added or updated unit tests - [ ] I have added or updated integration tests (if appropriate) - [ ] I have added or updated documentation ### Testing Instructions
1 parent f823b33 commit 021f2d4

File tree

5 files changed

+7
-2693
lines changed

5 files changed

+7
-2693
lines changed

.github/scripts/work-init.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,20 +36,20 @@ case $component in
3636
echo "[INFO] skipping for leaf package"
3737
;;
3838
sdk)
39-
rm go.work go.work.sum &&
39+
rm -f go.work go.work.sum &&
4040
go work init &&
4141
go work use ./sdk &&
4242
go work use ./service &&
4343
go work use ./examples
4444
;;
4545
service)
46-
rm go.work go.work.sum &&
46+
rm -f go.work go.work.sum &&
4747
go work init &&
4848
go work use ./service &&
4949
go work use ./examples
5050
;;
5151
examples)
52-
rm go.work go.work.sum &&
52+
rm -f go.work go.work.sum &&
5353
go work init &&
5454
go work use ./examples
5555
;;

.github/workflows/checks.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ jobs:
7979
run: |-
8080
go mod tidy
8181
go fmt ./...
82-
git restore go.sum "${GITHUB_WORKSPACE}/go.work.sum"
82+
git restore go.sum
8383
working-directory: ${{ matrix.directory }}
8484
- run: git diff
8585
- run: git diff-files --ignore-submodules
@@ -283,7 +283,7 @@ jobs:
283283
run: |-
284284
cd protocol/go
285285
go mod tidy
286-
git restore go.sum "${GITHUB_WORKSPACE}/go.work.sum"
286+
git restore go.sum
287287
- run: git diff
288288
- run: git diff-files --ignore-submodules
289289
- name: Check that make proto-generate has run before PR submission; see above for error details

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ tmp-gen/
3535
/sdkjava/target
3636
/serviceapp
3737
/service/opentdf
38+
/go.work.sum
3839
service/rttests/*.tdf
3940
coverage.out
4041
coverage.lcov

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ COPY lib/flattening lib/flattening
1010
COPY lib/fixtures lib/fixtures
1111
COPY service/ service/
1212
COPY examples/ examples/
13-
COPY go.work go.work.sum ./
13+
COPY go.work ./
1414
RUN cd service \
1515
&& go mod download \
1616
&& go mod verify

0 commit comments

Comments
 (0)