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
2 changes: 1 addition & 1 deletion .github/workflows/api-pr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: API PR CI
on:
pull_request:
branches:
- master
- main
- develop
workflow_dispatch:

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/api-prd.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: API PRD CI/CD

on:
push:
branches: [master]
branches: [main]
workflow_dispatch:

permissions:
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/auto-release-pr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,26 +23,26 @@ jobs:
with:
fetch-depth: 0

- name: Fetch master branch
run: git fetch origin master
- name: Fetch main branch
run: git fetch origin main

- name: Check for existing PR
id: check-pr
run: |
PR_COUNT=$(gh pr list --base master --head develop --state open --json number --jq 'length')
PR_COUNT=$(gh pr list --base main --head develop --state open --json number --jq 'length')
echo "pr_exists=$([[ $PR_COUNT -gt 0 ]] && echo 'true' || echo 'false')" >> $GITHUB_OUTPUT
echo "::notice::Open PRs from develop to master: $PR_COUNT"
echo "::notice::Open PRs from develop to main: $PR_COUNT"
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Check for differences
id: check-diff
if: steps.check-pr.outputs.pr_exists == 'false'
run: |
DIFF_COUNT=$(git rev-list --count origin/master..origin/develop)
DIFF_COUNT=$(git rev-list --count origin/main..origin/develop)
echo "has_changes=$([[ $DIFF_COUNT -gt 0 ]] && echo 'true' || echo 'false')" >> $GITHUB_OUTPUT
echo "commit_count=$DIFF_COUNT" >> $GITHUB_OUTPUT
echo "::notice::Commits ahead of master: $DIFF_COUNT"
echo "::notice::Commits ahead of main: $DIFF_COUNT"

- name: Create Release PR
if: steps.check-pr.outputs.pr_exists == 'false' && steps.check-diff.outputs.has_changes == 'true'
Expand All @@ -64,7 +64,7 @@ jobs:
> /tmp/pr-body.md

gh pr create \
--base master \
--base main \
--head develop \
--title "Release: develop -> master" \
--title "Release: develop -> main" \
--body-file /tmp/pr-body.md
4 changes: 2 additions & 2 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ name: "CodeQL Advanced"

on:
push:
branches: [ "develop", "master" ]
branches: [ "develop", "main" ]
pull_request:
branches: [ "develop", "master" ]
branches: [ "develop", "main" ]

jobs:
analyze:
Expand Down
2 changes: 1 addition & 1 deletion infrastructure/citrea/citreascan/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
1. Create the file `docker-compose-blockscout-citrea-testnet.frontend.env` in `/home/{user}`
1. Copy the content of the github repo file `https://github.com/CitreaScan/frontend/blob/develop/.env.dev` in `docker-compose-blockscout-citrea-testnet.frontend.env`

The `docker-compose-blockscout-citrea-testnet.backend.env` and `docker-compose-blockscout-citrea-testnet.frontend.env` files are also located in the corresponding github repos. They will be overwritten by github workflows in case of changes in the `develop` or in the `master` branch.
The `docker-compose-blockscout-citrea-testnet.backend.env` and `docker-compose-blockscout-citrea-testnet.frontend.env` files are also located in the corresponding github repos. They will be overwritten by github workflows in case of changes in the `develop` or in the `main` branch.

# Start Docker Containers

Expand Down
Loading