diff --git a/.github/workflows/check-catalogs.yml b/.github/workflows/check-catalogs.yml index cadd8fb0..3804bc84 100644 --- a/.github/workflows/check-catalogs.yml +++ b/.github/workflows/check-catalogs.yml @@ -12,6 +12,8 @@ jobs: contents: write steps: - uses: actions/checkout@v4 + with: + ref: catalog-validation - uses: actions/setup-python@v4 with: python-version: '3.10' @@ -31,7 +33,7 @@ jobs: mv -f check_datasets.js frontend/src/consts/check_datasets.js git config user.name "github-actions[bot]" git config user.email "41898282+github-actions[bot]@users.noreply.github.com" - git pull + git pull origin catalog-validation git add . git commit -m "auto-update via GH Action" - git push + git push origin catalog-validation diff --git a/.github/workflows/check-models.yml b/.github/workflows/check-models.yml index 7d4ac658..b829661d 100644 --- a/.github/workflows/check-models.yml +++ b/.github/workflows/check-models.yml @@ -11,6 +11,8 @@ jobs: contents: write steps: - uses: actions/checkout@v4 + with: + ref: catalog-validation - uses: actions/setup-python@v4 with: python-version: '3.10' @@ -32,8 +34,8 @@ jobs: mv -f check_models.js frontend/src/consts/check_models.js git config user.name "github-actions[bot]" git config user.email "41898282+github-actions[bot]@users.noreply.github.com" - git pull + git pull origin catalog-validation git add . git commit -m "auto-update via GH Action" - git push + git push origin catalog-validation \ No newline at end of file diff --git a/.github/workflows/frontend.yml b/.github/workflows/frontend.yml index b3f6cd4b..22bcd56f 100644 --- a/.github/workflows/frontend.yml +++ b/.github/workflows/frontend.yml @@ -7,7 +7,12 @@ jobs: steps: - name: Checkout uses: actions/checkout@v4 + with: + ref: catalog-validation + - name: Pull changes from main + run: git config pull.rebase true + - name: Install node uses: actions/setup-node@v4 with: