Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
push:
branches:
- master
- v6
- v5
schedule:
- cron: "37 10 * * 2"

Expand All @@ -20,7 +20,7 @@ permissions:

concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: ${{ github.ref != 'refs/heads/master' && github.ref != 'refs/heads/v6' }}
cancel-in-progress: ${{ github.ref != 'refs/heads/master' && github.ref != 'refs/heads/v5' }}

jobs:
analyze:
Expand Down
25 changes: 12 additions & 13 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,22 +14,21 @@ permissions:
### TODO: Also remove `get-prerelease`, `get-version`, `rubygems-publish`, `release-create`, `tag-create` and `tag-exists` actions from this repo's .github/actions folder and `ruby-release` from `./github/workflows` once the repo is public.

jobs:
# TODO: Re-enable rl-scanner once it is configured for the v6 branch.
# rl-scanner:
# uses: ./.github/workflows/rl-scanner.yml
# with:
# ruby-version: 3.2
# secrets:
# RLSECURE_LICENSE: ${{ secrets.RLSECURE_LICENSE }}
# RLSECURE_SITE_KEY: ${{ secrets.RLSECURE_SITE_KEY }}
# SIGNAL_HANDLER_TOKEN: ${{ secrets.SIGNAL_HANDLER_TOKEN }}
# PRODSEC_TOOLS_USER: ${{ secrets.PRODSEC_TOOLS_USER }}
# PRODSEC_TOOLS_TOKEN: ${{ secrets.PRODSEC_TOOLS_TOKEN }}
# PRODSEC_TOOLS_ARN: ${{ secrets.PRODSEC_TOOLS_ARN }}
rl-scanner:
uses: ./.github/workflows/rl-scanner.yml
with:
ruby-version: 3.3
secrets:
RLSECURE_LICENSE: ${{ secrets.RLSECURE_LICENSE }}
RLSECURE_SITE_KEY: ${{ secrets.RLSECURE_SITE_KEY }}
SIGNAL_HANDLER_TOKEN: ${{ secrets.SIGNAL_HANDLER_TOKEN }}
PRODSEC_TOOLS_USER: ${{ secrets.PRODSEC_TOOLS_USER }}
PRODSEC_TOOLS_TOKEN: ${{ secrets.PRODSEC_TOOLS_TOKEN }}
PRODSEC_TOOLS_ARN: ${{ secrets.PRODSEC_TOOLS_ARN }}

release:
uses: ./.github/workflows/ruby-release.yml
# needs: rl-scanner
needs: rl-scanner
with:
ruby-version: 3.3
secrets:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/sca_scan.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
name: SCA
on:
push:
branches: ["master", "v6"]
branches: ["master", "v5"]
pull_request:
branches: ["master", "v6"]
branches: ["master", "v5"]
jobs:
snyk-cli:
uses: auth0/devsecops-tooling/.github/workflows/sca-scan.yml@main
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,18 @@ on:
pull_request:
branches:
- master
- v6
- v5
push:
branches:
- master
- v6
- v5

permissions:
contents: read

concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: ${{ github.ref != 'refs/heads/master' && github.ref != 'refs/heads/v6' }}
cancel-in-progress: ${{ github.ref != 'refs/heads/master' && github.ref != 'refs/heads/v5' }}

env:
CACHE_KEY: "${{ github.ref }}-${{ github.run_id }}-${{ github.run_attempt }}"
Expand Down
2 changes: 1 addition & 1 deletion v6_MIGRATION_GUIDE.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# V6 Migration Guide

A guide to migrating from `ruby-auth0` (v5.x) to `auth0-ruby-sdk` (v6.x).
A guide to migrating from v5.x to v6.x of the `auth0` gem.

- [Overview](#overview)
- [Authentication API](#authentication-api)
Expand Down