Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into analytics_oss_migration
Browse files Browse the repository at this point in the history
  • Loading branch information
lsampras committed Nov 27, 2023
2 parents 7089de5 + 34f7e83 commit a03b7bc
Show file tree
Hide file tree
Showing 153 changed files with 2,079 additions and 559 deletions.
52 changes: 34 additions & 18 deletions .github/workflows/CI-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,17 +41,25 @@ jobs:
name: Check formatting
runs-on: ubuntu-latest
steps:
- name: Generate a token
if: ${{ github.event.pull_request.head.repo.full_name == github.event.pull_request.base.repo.full_name }}
id: generate_token
uses: actions/create-github-app-token@v1
with:
app-id: ${{ secrets.HYPERSWITCH_BOT_APP_ID }}
private-key: ${{ secrets.HYPERSWITCH_BOT_APP_PRIVATE_KEY }}

- name: Checkout repository with token
if: ${{ github.event.pull_request.head.repo.full_name == github.event.pull_request.base.repo.full_name }}
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0
ref: ${{ github.event.pull_request.head.ref }}
token: ${{ secrets.AUTO_FILE_UPDATE_PAT }}
token: ${{ steps.generate_token.outputs.token }}

- name: Checkout repository for fork
if: ${{ github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name }}
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Install Rust
uses: dtolnay/rust-toolchain@master
Expand All @@ -71,8 +79,8 @@ jobs:
cargo +nightly fmt --all
if ! git diff --exit-code --quiet -- crates; then
echo "::notice::Formatting check failed"
git config --local user.name 'github-actions[bot]'
git config --local user.email '41898282+github-actions[bot]@users.noreply.github.com'
git config --local user.name 'hyperswitch-bot[bot]'
git config --local user.email '148525504+hyperswitch-bot[bot]@users.noreply.github.com'
git add crates
git commit --message 'chore: run formatter'
git push
Expand All @@ -91,7 +99,7 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: "Fetch base branch"
shell: bash
Expand All @@ -108,12 +116,12 @@ jobs:
with:
toolchain: 1.65

- uses: Swatinem/rust-cache@v2.4.0
- uses: Swatinem/rust-cache@v2.7.0
with:
save-if: ${{ github.event_name == 'push' }}

- name: Install cargo-hack
uses: baptiste0928/cargo-install@v2.1.0
uses: baptiste0928/cargo-install@v2.2.0
with:
crate: cargo-hack
version: 0.6.5
Expand Down Expand Up @@ -280,7 +288,7 @@ jobs:

# steps:
# - name: Checkout repository
# uses: actions/checkout@v3
# uses: actions/checkout@v4

# - name: Run cargo-deny
# uses: EmbarkStudios/[email protected]
Expand All @@ -299,17 +307,25 @@ jobs:
# - windows-latest

steps:
- name: Generate a token
if: ${{ github.event.pull_request.head.repo.full_name == github.event.pull_request.base.repo.full_name }}
id: generate_token
uses: actions/create-github-app-token@v1
with:
app-id: ${{ secrets.HYPERSWITCH_BOT_APP_ID }}
private-key: ${{ secrets.HYPERSWITCH_BOT_APP_PRIVATE_KEY }}

- name: Checkout repository for fork
if: ${{ (github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name) }}
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Checkout repository with token
if: ${{ (github.event.pull_request.head.repo.full_name == github.event.pull_request.base.repo.full_name) }}
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0
ref: ${{ github.event.pull_request.head.ref }}
token: ${{ secrets.AUTO_FILE_UPDATE_PAT }}
token: ${{ steps.generate_token.outputs.token }}

- name: "Fetch base branch"
shell: bash
Expand All @@ -328,16 +344,16 @@ jobs:
components: clippy

- name: Install cargo-hack
uses: baptiste0928/cargo-install@v2.1.0
uses: baptiste0928/cargo-install@v2.2.0
with:
crate: cargo-hack

# - name: Install cargo-nextest
# uses: baptiste0928/cargo-install@v2.1.0
# uses: baptiste0928/cargo-install@v2.2.0
# with:
# crate: cargo-nextest

- uses: Swatinem/rust-cache@v2.4.0
- uses: Swatinem/rust-cache@v2.7.0
with:
save-if: ${{ github.event_name == 'push' }}

Expand All @@ -360,8 +376,8 @@ jobs:
shell: bash
run: |
if ! git diff --quiet --exit-code -- Cargo.lock ; then
git config --local user.name 'github-actions[bot]'
git config --local user.email '41898282+github-actions[bot]@users.noreply.github.com'
git config --local user.name 'hyperswitch-bot[bot]'
git config --local user.email '148525504+hyperswitch-bot[bot]@users.noreply.github.com'
git add Cargo.lock
git commit --message 'chore: update Cargo.lock'
git push
Expand Down Expand Up @@ -516,7 +532,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Spell check
uses: crate-ci/typos@master
20 changes: 10 additions & 10 deletions .github/workflows/CI-push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Install Rust
uses: dtolnay/rust-toolchain@master
Expand All @@ -50,7 +50,7 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Install mold linker
uses: rui314/setup-mold@v1
Expand All @@ -63,12 +63,12 @@ jobs:
with:
toolchain: 1.65

- uses: Swatinem/rust-cache@v2.4.0
- uses: Swatinem/rust-cache@v2.7.0
with:
save-if: ${{ github.event_name == 'push' }}

- name: Install cargo-hack
uses: baptiste0928/cargo-install@v2.1.0
uses: baptiste0928/cargo-install@v2.2.0
with:
crate: cargo-hack
version: 0.6.5
Expand Down Expand Up @@ -101,7 +101,7 @@ jobs:

# steps:
# - name: Checkout repository
# uses: actions/checkout@v3
# uses: actions/checkout@v4

# - name: Run cargo-deny
# uses: EmbarkStudios/[email protected]
Expand All @@ -121,7 +121,7 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Install mold linker
uses: rui314/setup-mold@v1
Expand All @@ -136,16 +136,16 @@ jobs:
components: clippy

- name: Install cargo-hack
uses: baptiste0928/cargo-install@v2.1.0
uses: baptiste0928/cargo-install@v2.2.0
with:
crate: cargo-hack

# - name: Install cargo-nextest
# uses: baptiste0928/cargo-install@v2.1.0
# uses: baptiste0928/cargo-install@v2.2.0
# with:
# crate: cargo-nextest

- uses: Swatinem/rust-cache@v2.4.0
- uses: Swatinem/rust-cache@v2.7.0
with:
save-if: ${{ github.event_name == 'push' }}

Expand Down Expand Up @@ -178,7 +178,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Spell check
uses: crate-ci/typos@master
12 changes: 6 additions & 6 deletions .github/workflows/auto-release-tag.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,18 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0

- name: Login to Docker Hub
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKERHUB_USER }}
password: ${{ secrets.DOCKERHUB_PASSWD }}

- name: Build and push router Docker image
uses: docker/build-push-action@v4
uses: docker/build-push-action@v5
with:
build-args: |
BINARY=router
Expand All @@ -30,7 +30,7 @@ jobs:
tags: juspaydotin/orca:${{ github.ref_name }}, juspaydotin/hyperswitch-router:${{ github.ref_name }}

- name: Build and push consumer Docker image
uses: docker/build-push-action@v4
uses: docker/build-push-action@v5
with:
build-args: |
BINARY=scheduler
Expand All @@ -40,7 +40,7 @@ jobs:
tags: juspaydotin/orca-consumer:${{ github.ref_name }}, juspaydotin/hyperswitch-consumer:${{ github.ref_name }}

- name: Build and push producer Docker image
uses: docker/build-push-action@v4
uses: docker/build-push-action@v5
with:
build-args: |
BINARY=scheduler
Expand All @@ -50,7 +50,7 @@ jobs:
tags: juspaydotin/orca-producer:${{ github.ref_name }}, juspaydotin/hyperswitch-producer:${{ github.ref_name }}

- name: Build and push drainer Docker image
uses: docker/build-push-action@v4
uses: docker/build-push-action@v5
with:
build-args: |
BINARY=drainer
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/connector-sanity-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -79,14 +79,14 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Install Rust
uses: dtolnay/rust-toolchain@master
with:
toolchain: stable 2 weeks ago

- uses: Swatinem/rust-cache@v2.4.0
- uses: Swatinem/rust-cache@v2.7.0

- name: Decrypt connector auth file
env:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/connector-ui-sanity-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ jobs:
- name: Checkout repository
if: ${{ (github.event_name == 'pull_request') && (github.event.pull_request.head.repo.full_name == github.event.pull_request.base.repo.full_name) }}
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Decrypt connector auth file
if: ${{ (github.event_name == 'pull_request') && (github.event.pull_request.head.repo.full_name == github.event.pull_request.base.repo.full_name) }}
Expand Down Expand Up @@ -113,10 +113,10 @@ jobs:
toolchain: stable

- name: Build and Cache Rust Dependencies
uses: Swatinem/rust-cache@v2.4.0
uses: Swatinem/rust-cache@v2.7.0

- name: Install Diesel CLI with Postgres Support
uses: baptiste0928/cargo-install@v2.1.0
uses: baptiste0928/cargo-install@v2.2.0
if: ${{ (github.event_name == 'pull_request') && (github.event.pull_request.head.repo.full_name == github.event.pull_request.base.repo.full_name) }}
with:
crate: diesel_cli
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/conventional-commit-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:
with:
toolchain: stable 2 weeks ago

- uses: baptiste0928/cargo-install@v2.1.0
- uses: baptiste0928/cargo-install@v2.2.0
with:
crate: cocogitto

Expand Down
12 changes: 10 additions & 2 deletions .github/workflows/create-hotfix-branch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,19 @@ jobs:
runs-on: ubuntu-latest

steps:
- name: Generate a token
if: ${{ github.event.pull_request.head.repo.full_name == github.event.pull_request.base.repo.full_name }}
id: generate_token
uses: actions/create-github-app-token@v1
with:
app-id: ${{ secrets.HYPERSWITCH_BOT_APP_ID }}
private-key: ${{ secrets.HYPERSWITCH_BOT_APP_PRIVATE_KEY }}

- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0
token: ${{ secrets.AUTO_RELEASE_PAT }}
token: ${{ steps.generate_token.outputs.token }}

- name: Check if the input is valid tag
shell: bash
Expand Down
18 changes: 13 additions & 5 deletions .github/workflows/create-hotfix-tag.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,22 @@ jobs:
runs-on: ubuntu-latest

steps:
- name: Generate a token
if: ${{ github.event.pull_request.head.repo.full_name == github.event.pull_request.base.repo.full_name }}
id: generate_token
uses: actions/create-github-app-token@v1
with:
app-id: ${{ secrets.HYPERSWITCH_BOT_APP_ID }}
private-key: ${{ secrets.HYPERSWITCH_BOT_APP_PRIVATE_KEY }}

- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0
token: ${{ secrets.AUTO_RELEASE_PAT }}
token: ${{ steps.generate_token.outputs.token }}

- name: Install git-cliff
uses: baptiste0928/cargo-install@v2.1.0
uses: baptiste0928/cargo-install@v2.2.0
with:
crate: git-cliff
version: 1.2.0
Expand Down Expand Up @@ -86,8 +94,8 @@ jobs:
- name: Set Git Configuration
shell: bash
run: |
git config --local user.name 'github-actions'
git config --local user.email '41898282+github-actions[bot]@users.noreply.github.com'
git config --local user.name 'hyperswitch-bot[bot]'
git config --local user.email '148525504+hyperswitch-bot[bot]@users.noreply.github.com'
- name: Push created commit and tag
shell: bash
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/hotfix-pr-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Get hotfix pull request body
shell: bash
Expand Down
Loading

0 comments on commit a03b7bc

Please sign in to comment.