Skip to content

Commit 4aaf265

Browse files
authored
Merge branch 'master' into ip/test-supported-bazel-versions
2 parents 36b23a4 + 6d315fd commit 4aaf265

File tree

4 files changed

+19
-8
lines changed

4 files changed

+19
-8
lines changed

.bazelci/presubmit.yml

+2
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,12 @@ tasks:
77
shell_commands:
88
- "sudo apt -y update && sudo apt -y install libgmp-dev"
99
build_flags:
10+
- "--config=ci-common"
1011
- "--build_tag_filters=-requires_nix,-requires_lz4,-requires_shellcheck,-requires_threaded_rts,-dont_test_with_bindist,-dont_test_on_bazelci"
1112
build_targets:
1213
- "//tests/..."
1314
test_flags:
15+
- "--config=ci-common"
1416
- "--test_tag_filters=-requires_nix,-requires_lz4,-requires_shellcheck,-requires_threaded_rts,-dont_test_with_bindist,-dont_test_on_bazelci"
1517
test_targets:
1618
- "//tests/..."

.bazelrc

+3-3
Original file line numberDiff line numberDiff line change
@@ -61,14 +61,14 @@ build:ci-common --experimental_repository_cache_hardlinks
6161

6262
# Use a remote cache during CI
6363
build:ci-common --bes_results_url=https://app.buildbuddy.io/invocation/
64-
build:ci-common --bes_backend=grpcs://cloud.buildbuddy.io
65-
build:remote-cache --remote_cache=grpcs://cloud.buildbuddy.io
64+
build:ci-common --bes_backend=grpcs://remote.buildbuddy.io
65+
build:remote-cache --remote_cache=grpcs://remote.buildbuddy.io
6666
build:ci-common --remote_timeout=3600
6767
# Avoid failures of the form `deadline exceeded after 14999958197ns DEADLINE_EXCEEDED`.
6868
# See https://github.com/tweag/rules_haskell/issues/1498.
6969
build:ci-common --keep_backend_build_event_connections_alive=false
7070

71-
test:ci --test_output=errors
71+
test:ci-common --test_output=errors
7272

7373
build:ci-linux-bindist --config=linux-bindist
7474
build:ci-linux-nixpkgs --config=linux-nixpkgs

.github/dependabot.yml

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
version: 2
2+
updates:
3+
4+
- package-ecosystem: "github-actions"
5+
directory: "/"
6+
schedule:
7+
# Check for updates to GitHub Actions every weekday
8+
interval: "daily"
9+

.github/workflows/workflow.yaml

+5-5
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@ jobs:
1515
steps:
1616
- uses: actions/checkout@v2
1717
- name: Mount Bazel cache
18-
uses: actions/cache@v2
18+
uses: actions/cache@v3
1919
with:
2020
path: ~/repo-cache
2121
key: repo-cache-${{ runner.os }}-nixpkgs-${{ env.cache-version }}
22-
- uses: cachix/install-nix-action@v12
22+
- uses: cachix/install-nix-action@v17
2323
with:
2424
nix_path: nixpkgs=./nixpkgs/default.nix
2525
extra_nix_config: |
@@ -66,11 +66,11 @@ jobs:
6666
steps:
6767
- uses: actions/checkout@v2
6868
- name: Mount Bazel cache
69-
uses: actions/cache@v2
69+
uses: actions/cache@v3
7070
with:
7171
path: ~/repo-cache
7272
key: repo-cache-${{ runner.os }}-nixpkgs-${{ env.cache-version }}
73-
- uses: cachix/install-nix-action@v12
73+
- uses: cachix/install-nix-action@v17
7474
with:
7575
nix_path: nixpkgs=./nixpkgs/default.nix
7676
extra_nix_config: |
@@ -113,7 +113,7 @@ jobs:
113113
steps:
114114
- uses: actions/checkout@v2
115115
- name: Mount Bazel cache
116-
uses: actions/cache@v2
116+
uses: actions/cache@v3
117117
with:
118118
path: ~/repo-cache
119119
key: repo-cache-${{ runner.os }}-bindist-${{ env.cache-version }}

0 commit comments

Comments
 (0)