Skip to content

Commit

Permalink
Merge branch 'master' into rfd/0198-hardware-key-pin-caching
Browse files Browse the repository at this point in the history
  • Loading branch information
Joerger authored Feb 11, 2025
2 parents 088a189 + 3d6b26b commit e24df52
Show file tree
Hide file tree
Showing 1,024 changed files with 39,336 additions and 19,393 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/aws-e2e-tests-non-root.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ jobs:
continue-on-error: true

- name: Configure AWS Credentials
uses: aws-actions/configure-aws-credentials@e3dd6a429d7300a6a4c196c26e071d42e0343502 # v4.0.2
uses: aws-actions/configure-aws-credentials@4fc4975a852c8cd99761e2de1f4ba73402e44dd9 # v4.0.3
with:
aws-region: ${{ env.AWS_REGION }}
role-to-assume: ${{ env.GHA_ASSUME_ROLE }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-ci-service-images.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:

- name: Build etcd image
id: docker_build
uses: docker/build-push-action@67a2d409c0a876cbe6b11854e3e25193efe4e62d # v6.12.0
uses: docker/build-push-action@ca877d9245402d1537745e0e356eab47c3520991 # v6.13.0
with:
context: ${{ github.workspace }}
file: .github/services/Dockerfile.etcd
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/build-macos.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ jobs:

- name: Setup pnpm
run: |
npm install -g corepack@0.31.0
corepack enable pnpm
- name: Install Go Toolchain
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build-usage-image.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,15 @@ jobs:
echo "version=${GITHUB_REF_NAME#v}" >> $GITHUB_OUTPUT
- uses: actions/checkout@v4
- uses: docker/setup-buildx-action@6524bf65af31da8d45b59e8c27de4bd072b392f5 # v3.8.0
- uses: aws-actions/configure-aws-credentials@e3dd6a429d7300a6a4c196c26e071d42e0343502 # v4.0.2
- uses: aws-actions/configure-aws-credentials@4fc4975a852c8cd99761e2de1f4ba73402e44dd9 # v4.0.3
with:
role-to-assume: ${{ secrets.TELEPORT_USAGE_IAM_ROLE_ARN }}
aws-region: us-east-1
- uses: aws-actions/amazon-ecr-login@062b18b96a7aff071d4dc91bc00c4c1a7945b076 # v2.0.1
with:
registry-type: public
# Build and publish container image on ECR.
- uses: docker/build-push-action@67a2d409c0a876cbe6b11854e3e25193efe4e62d # v6.12.0
- uses: docker/build-push-action@ca877d9245402d1537745e0e356eab47c3520991 # v6.13.0
with:
context: "examples/teleport-usage"
tags: public.ecr.aws/gravitational/teleport-usage:${{ steps.version.outputs.version }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/doc-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ jobs:
- name: Run the linter
uses: errata-ai/vale-action@d89dee975228ae261d22c15adcd03578634d429c # v2.1.1
with:
version: 2.30.0
version: 3.9.4
# Take the comma-separated list of files returned by the "Check for
# relevant changes" job.
separator: ","
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docs-amplify.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
environment: docs-amplify
steps:
- name: Configure AWS credentials
uses: aws-actions/configure-aws-credentials@e3dd6a429d7300a6a4c196c26e071d42e0343502 # v4
uses: aws-actions/configure-aws-credentials@4fc4975a852c8cd99761e2de1f4ba73402e44dd9 # v4
with:
aws-region: us-west-2
role-to-assume: ${{ vars.IAM_ROLE }}
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/lint-ui.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,9 @@ jobs:
node --version
- name: Install JS dependencies
run: pnpm install --frozen-lockfile
run: |
npm install -g corepack@0.31.0
pnpm install --frozen-lockfile
- name: Build WASM
run: pnpm build-wasm
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/unit-tests-ui.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,9 @@ jobs:
node --version
- name: Install JS dependencies
run: pnpm install --frozen-lockfile
run: |
npm install -g corepack@0.31.0
pnpm install --frozen-lockfile
- name: Build WASM
run: pnpm build-wasm
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/update-ami-ids.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
ref: master

- name: Assume AWS role
uses: aws-actions/configure-aws-credentials@e3dd6a429d7300a6a4c196c26e071d42e0343502 # v4.0.2
uses: aws-actions/configure-aws-credentials@4fc4975a852c8cd99761e2de1f4ba73402e44dd9 # v4.0.3
with:
aws-region: us-west-2
role-to-assume: "arn:aws:iam::146628656107:role/tf-teleport-ami-gha-role"
Expand Down
3 changes: 0 additions & 3 deletions .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,6 @@ issues:
- path: provider/provider.go # integrations/terraform
linters: [staticcheck]
text: 'grpc.WithReturnConnectionError is deprecated'
- linters: [govet]
path-except: ^e/
text: 'non-constant format string in call to github.com/gravitational/trace.'
# BlockUntilContext should indeed be favored, this exception exists because
# at this time there are too many offenders.
- linters: [staticcheck]
Expand Down
Loading

0 comments on commit e24df52

Please sign in to comment.