Skip to content

Commit 31f77cd

Browse files
committed
[netlify-ignore]
2 parents d3f1ec7 + 38e6a1c commit 31f77cd

File tree

4 files changed

+33
-13
lines changed

4 files changed

+33
-13
lines changed

.buildkite/pipeline.yml

100644100755
Lines changed: 27 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,23 @@
11
steps:
2+
- label: ":hammer: Install Dependencies"
3+
command:
4+
- make deps
5+
env:
6+
SEGMENT_CONTEXTS: "snyk, aws-credentials"
7+
plugins:
8+
- docker#v3.3.0:
9+
image: jekyll/jekyll:4.2.0
10+
- ssh://[email protected]/segmentio/cache-buildkite-plugin#v3.0.0:
11+
key: "v2-cache-gem-{{ checksum 'Gemfile.lock' }}"
12+
paths: [ "vendor/" ]
13+
save: true
14+
- ssh://[email protected]/segmentio/cache-buildkite-plugin#v3.0.0:
15+
key: "v2-cache-npm-{{ checksum 'yarn.lock' }}"
16+
paths: [ "node_modules/" ]
17+
save: true
18+
19+
- wait: ~
20+
221
- label: ":hammer: Build Dependencies and Docs"
322
command:
423
- make test
@@ -10,18 +29,17 @@ steps:
1029
- build_package.tar.gz
1130
plugins:
1231
- docker#v3.3.0:
13-
image: jekyll/jekyll
32+
image: jekyll/jekyll:4.2.0
1433
environment:
1534
- BUILDKITE_BRANCH
16-
17-
- ssh://[email protected]/segmentio/cache-buildkite-plugin#v1.0.0:
18-
key: "v1-cache-gem-{{ checksum 'Gemfile.lock' }}"
35+
- ssh://[email protected]/segmentio/cache-buildkite-plugin#v3.0.0:
36+
key: "v2-cache-gem-{{ checksum 'Gemfile.lock' }}"
1937
paths: [ "vendor/" ]
20-
- ssh://[email protected]/segmentio/cache-buildkite-plugin#v1.0.0:
21-
key: "v1-cache-npm-{{ checksum 'yarn.lock' }}"
38+
- ssh://[email protected]/segmentio/cache-buildkite-plugin#v3.0.0:
39+
key: "v2-cache-npm-{{ checksum 'yarn.lock' }}"
2240
paths: [ "node_modules/" ]
23-
24-
- wait
41+
42+
- wait: ~
2543

2644
- label: ":shipit: Deploy Docs to S3"
2745
env:
@@ -30,4 +48,4 @@ steps:
3048
command:
3149
- buildkite-agent artifact download build_package.tar.gz .
3250
- make unzip-artifacts
33-
- make upload-docs
51+
- make upload-docs

Gemfile.lock

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@ GEM
9797

9898
PLATFORMS
9999
ruby
100+
x86_64-linux-musl
100101

101102
DEPENDENCIES
102103
dotenv
@@ -115,4 +116,4 @@ DEPENDENCIES
115116
wdm (~> 0.1.0)
116117

117118
BUNDLED WITH
118-
2.1.4
119+
2.2.2

Makefile

100644100755
Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,9 @@ node_modules: package.json yarn.lock
101101
vendor/bundle:
102102
@export BUNDLE_PATH="vendor/bundle"
103103
@mkdir -p vendor && mkdir -p vendor/bundle
104-
@chmod -R 777 vendor/
105-
@bundle install --path=vendor/bundle
104+
@chmod -R 777 vendor/ Gemfile.lock
105+
@bundle config set --local path 'vendor/bundle'
106+
@bundle install
106107

107108

108109
.PHONY: lint

src/segment-app/iam/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ Users access their Segment account with either email/password credentials, or by
2727
`Owners` manage all aspects of the workspace, and `members` can have access to specific products and resource types.
2828

2929
> info ""
30-
> **Note**: If you are on a Free or Team plan, only the `workspace owner` and `source admin` roles are available._
30+
> **Note**: If you are on a Free or Team plan, only the `workspace owner` and `source admin` roles are available.
3131
3232
Check out the [Roles documentation](/docs/segment-app/iam/roles/) for more details.
3333

0 commit comments

Comments
 (0)