Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

cmd/gitannex: Add layout modes for compatibility #7754

Merged
merged 11 commits into from
May 13, 2024
Merged

cmd/gitannex: Add layout modes for compatibility #7754

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
b3590d2
cmd/gitannex: Simplify messageParser's finalParameter() func
dmcardle Apr 11, 2024
c2d46e4
cmd/gitannex: Add support for different layouts
dmcardle Apr 11, 2024
ed72e48
cmd/gitannex: Refactor e2e tests, add layout compat tests
dmcardle Apr 11, 2024
8734d75
cmd/gitannex: Repeat TestEndToEnd for all layout modes
dmcardle Apr 11, 2024
b60f99e
cmd/gitannex: Drop chdir from e2e tests
dmcardle Apr 11, 2024
ba40332
cmd/gitannex: Describe new rclonelayout config in help
dmcardle Apr 11, 2024
3bb5fec
cmd/gitannex: Add TestEndToEndMigration tests
dmcardle Apr 15, 2024
019f91b
.github/workflows: Install git-annex-remote-rclone on Linux and macOS
dmcardle Apr 15, 2024
1cbf9a2
cmd/gitannex: Remove assumption in e2e test version check
dmcardle Apr 17, 2024
6370301
build: Inject rclone version tag when testing
dmcardle Apr 17, 2024
d2196bf
cmd/gitannex: When tags do not match, run e2e tests anyway
dmcardle Apr 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ jobs:
sudo modprobe fuse
sudo chmod 666 /dev/fuse
sudo chown root:$USER /etc/fuse.conf
sudo apt-get install fuse3 libfuse-dev rpm pkg-config git-annex
sudo apt-get install fuse3 libfuse-dev rpm pkg-config git-annex git-annex-remote-rclone
if: matrix.os == 'ubuntu-latest'

- name: Install Libraries on macOS
Expand All @@ -137,7 +137,7 @@ jobs:
brew untap --force homebrew/cask
brew update
brew install --cask macfuse
brew install git-annex
brew install git-annex git-annex-remote-rclone
if: matrix.os == 'macos-latest'

- name: Install Libraries on Windows
Expand Down
11 changes: 6 additions & 5 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,14 +43,15 @@ ifdef GOTAGS
BUILDTAGS=-tags "$(GOTAGS)"
LINTTAGS=--build-tags "$(GOTAGS)"
endif
LDFLAGS=--ldflags "-s -X github.com/rclone/rclone/fs.Version=$(TAG)"

.PHONY: rclone test_all vars version

rclone:
ifeq ($(GO_OS),windows)
go run bin/resource_windows.go -version $(TAG) -syso resource_windows_`go env GOARCH`.syso
endif
go build -v --ldflags "-s -X github.com/rclone/rclone/fs.Version=$(TAG)" $(BUILDTAGS) $(BUILD_ARGS)
go build -v $(LDFLAGS) $(BUILDTAGS) $(BUILD_ARGS)
ifeq ($(GO_OS),windows)
rm resource_windows_`go env GOARCH`.syso
endif
Expand All @@ -59,7 +60,7 @@ endif
mv -v `go env GOPATH`/bin/rclone`go env GOEXE`.new `go env GOPATH`/bin/rclone`go env GOEXE`

test_all:
go install --ldflags "-s -X github.com/rclone/rclone/fs.Version=$(TAG)" $(BUILDTAGS) $(BUILD_ARGS) github.com/rclone/rclone/fstest/test_all
go install $(LDFLAGS) $(BUILDTAGS) $(BUILD_ARGS) github.com/rclone/rclone/fstest/test_all

vars:
@echo SHELL="'$(SHELL)'"
Expand Down Expand Up @@ -87,13 +88,13 @@ test: rclone test_all

# Quick test
quicktest:
RCLONE_CONFIG="/notfound" go test $(BUILDTAGS) ./...
RCLONE_CONFIG="/notfound" go test $(LDFLAGS) $(BUILDTAGS) ./...

racequicktest:
RCLONE_CONFIG="/notfound" go test $(BUILDTAGS) -cpu=2 -race ./...
RCLONE_CONFIG="/notfound" go test $(LDFLAGS) $(BUILDTAGS) -cpu=2 -race ./...

compiletest:
RCLONE_CONFIG="/notfound" go test $(BUILDTAGS) -run XXX ./...
RCLONE_CONFIG="/notfound" go test $(LDFLAGS) $(BUILDTAGS) -run XXX ./...

# Do source code quality checks
check: rclone
Expand Down