Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
Sakura-Byte committed May 2, 2024
2 parents 32f4d6d + 254e514 commit 3bccf4b
Show file tree
Hide file tree
Showing 625 changed files with 109,746 additions and 23,205 deletions.
4 changes: 4 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# Go writes go.mod and go.sum with lf even on windows
go.mod text eol=lf
go.sum text eol=lf

# Ignore generated files in GitHub language statistics and diffs
/MANUAL.* linguist-generated=true
/rclone.1 linguist-generated=true
Expand Down
71 changes: 44 additions & 27 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ jobs:
quicktest: true

- job_name: mac_amd64
os: macos-11
os: macos-latest
go: '>=1.22.0-rc.1'
gotags: 'cmount'
build_flags: '-include "^darwin/amd64" -cgo'
Expand All @@ -58,7 +58,7 @@ jobs:
deploy: true

- job_name: mac_arm64
os: macos-11
os: macos-latest
go: '>=1.22.0-rc.1'
gotags: 'cmount'
build_flags: '-include "^darwin/arm64" -cgo -macos-arch arm64 -cgo-cflags=-I/usr/local/include -cgo-ldflags=-L/usr/local/lib'
Expand Down 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
sudo apt-get install fuse3 libfuse-dev rpm pkg-config git-annex
if: matrix.os == 'ubuntu-latest'

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

- name: Install Libraries on Windows
shell: powershell
Expand Down Expand Up @@ -167,14 +168,6 @@ jobs:
printf "\n\nSystem environment:\n\n"
env
- name: Go module cache
uses: actions/cache@v4
with:
path: ~/go/pkg/mod
key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
restore-keys: |
${{ runner.os }}-go-
- name: Build rclone
shell: bash
run: |
Expand Down Expand Up @@ -241,18 +234,50 @@ jobs:
- name: Checkout
uses: actions/checkout@v4

- name: Code quality test
uses: golangci/golangci-lint-action@v3
with:
# Optional: version of golangci-lint to use in form of v1.2 or v1.2.3 or `latest` to use the latest version
version: latest

# Run govulncheck on the latest go version, the one we build binaries with
- name: Install Go
uses: actions/setup-go@v5
with:
go-version: '>=1.22.0-rc.1'
check-latest: true
cache: false

- name: Code quality test (Linux)
uses: golangci/golangci-lint-action@v4
with:
version: latest
skip-cache: false # Caching enabled (which is default) on this first lint step only, it handles complete cache of build, go modules and golangci-lint analysis which was necessary to get all lint steps to properly take advantage of it

- name: Code quality test (Windows)
uses: golangci/golangci-lint-action@v4
env:
GOOS: "windows"
with:
version: latest
skip-cache: true

- name: Code quality test (macOS)
uses: golangci/golangci-lint-action@v4
env:
GOOS: "darwin"
with:
version: latest
skip-cache: true

- name: Code quality test (FreeBSD)
uses: golangci/golangci-lint-action@v4
env:
GOOS: "freebsd"
with:
version: latest
skip-cache: true

- name: Code quality test (OpenBSD)
uses: golangci/golangci-lint-action@v4
env:
GOOS: "openbsd"
with:
version: latest
skip-cache: true

- name: Install govulncheck
run: go install golang.org/x/vuln/cmd/govulncheck@latest
Expand All @@ -278,14 +303,6 @@ jobs:
with:
go-version: '>=1.22.0-rc.1'

- name: Go module cache
uses: actions/cache@v4
with:
path: ~/go/pkg/mod
key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
restore-keys: |
${{ runner.os }}-go-
- name: Set global environment variables
shell: bash
run: |
Expand Down
28 changes: 14 additions & 14 deletions .github/workflows/winget.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
name: Publish to Winget
on:
release:
types: [released]

jobs:
publish:
runs-on: ubuntu-latest
steps:
- uses: vedantmgoyal2009/winget-releaser@v2
with:
identifier: Rclone.Rclone
installers-regex: '-windows-\w+\.zip$'
token: ${{ secrets.WINGET_TOKEN }}
name: Publish to Winget
on:
release:
types: [released]

jobs:
publish:
runs-on: ubuntu-latest
steps:
- uses: vedantmgoyal2009/winget-releaser@v2
with:
identifier: Rclone.Rclone
installers-regex: '-windows-\w+\.zip$'
token: ${{ secrets.WINGET_TOKEN }}
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ docs/public
rclone.iml
.idea
.history
.vscode
*.test
*.iml
fuzz-build.zip
Expand Down
Loading

0 comments on commit 3bccf4b

Please sign in to comment.