Skip to content

Commit a16b552

Browse files
authored
chore: Use package(from:) for Dependabot friendly (#60)
## What's Changed Use `package(from:)` because Dependabot doesn't like `upToNextMajor()`. This also changes `package()` for FlatBuffers. We can use `from:` not `branch:` for FlatBuffers too. This also changes Dependabot interval to trigger the next Dependabot runs immediately. Closes #59.
1 parent 672a48c commit a16b552

File tree

6 files changed

+21
-23
lines changed

6 files changed

+21
-23
lines changed

.github/dependabot.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,42 +20,42 @@ updates:
2020
- package-ecosystem: "github-actions"
2121
directory: "/"
2222
schedule:
23-
interval: "weekly"
23+
interval: "daily"
2424
commit-message:
2525
prefix: "chore: "
2626
open-pull-requests-limit: 10
2727
- package-ecosystem: "swift"
2828
directory: "/"
2929
schedule:
30-
interval: "weekly"
30+
interval: "daily"
3131
commit-message:
3232
prefix: "chore: "
3333
open-pull-requests-limit: 10
3434
- package-ecosystem: "swift"
3535
directory: "/Arrow/"
3636
schedule:
37-
interval: "weekly"
37+
interval: "daily"
3838
commit-message:
3939
prefix: "chore: "
4040
open-pull-requests-limit: 10
4141
- package-ecosystem: "swift"
4242
directory: "/ArrowFlight/"
4343
schedule:
44-
interval: "weekly"
44+
interval: "daily"
4545
commit-message:
4646
prefix: "chore: "
4747
open-pull-requests-limit: 10
4848
- package-ecosystem: "gomod"
4949
directory: "/CDataWGo/"
5050
schedule:
51-
interval: "weekly"
51+
interval: "daily"
5252
commit-message:
5353
prefix: "chore: "
5454
open-pull-requests-limit: 10
5555
- package-ecosystem: "gomod"
5656
directory: "/data-generator/swift-datagen/"
5757
schedule:
58-
interval: "weekly"
58+
interval: "daily"
5959
commit-message:
6060
prefix: "chore: "
6161
open-pull-requests-limit: 10

.github/workflows/test.yaml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,11 @@ jobs:
7878
with:
7979
path: .docker
8080
key: docker-${{ matrix.swift-version }}-${{ hashFiles('**/Package.resolved', '**/go.sum') }}
81-
restore-keys: docker-${{ matrix.swift-version }}-
81+
# Don't reuse existing cache because "git fetch" is failed
82+
# in Docker without "git config --global --add
83+
# safe.directory".
84+
#
85+
# restore-keys: docker-${{ matrix.swift-version }}-
8286
- name: Pull
8387
run: |
8488
docker compose pull --ignore-pull-failures ubuntu

Arrow/Package.resolved

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Arrow/Package.swift

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,8 @@ let package = Package(
3131
targets: ["Arrow"])
3232
],
3333
dependencies: [
34-
.package(url: "https://github.com/google/flatbuffers.git", branch: "v25.2.10"),
35-
.package(
36-
url: "https://github.com/apple/swift-atomics.git",
37-
.upToNextMajor(from: "1.2.0") // or `.upToNextMinor
38-
)
34+
.package(url: "https://github.com/google/flatbuffers.git", from: "25.2.10"),
35+
.package(url: "https://github.com/apple/swift-atomics.git", from: "1.3.0")
3936
],
4037
targets: [
4138
.target(

Package.resolved

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Package.swift

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,10 @@ let package = Package(
3131
targets: ["Arrow"])
3232
],
3333
dependencies: [
34-
.package(url: "https://github.com/google/flatbuffers.git", branch: "v25.2.10"),
34+
.package(url: "https://github.com/google/flatbuffers.git", from: "25.2.10"),
3535
.package(url: "https://github.com/grpc/grpc-swift.git", from: "1.25.0"),
3636
.package(url: "https://github.com/apple/swift-protobuf.git", from: "1.29.0"),
37-
.package(
38-
url: "https://github.com/apple/swift-atomics.git",
39-
.upToNextMajor(from: "1.2.0") // or `.upToNextMinor
40-
)
37+
.package(url: "https://github.com/apple/swift-atomics.git", from: "1.3.0")
4138
],
4239
targets: [
4340
.target(

0 commit comments

Comments
 (0)