From 847a33a0cc2704b44f73fa8613bc603724c24fb3 Mon Sep 17 00:00:00 2001 From: Tetsuo Koyama Date: Tue, 7 Jan 2025 15:35:26 +0900 Subject: [PATCH 1/2] Update references to master branch. ref https://github.com/enthought/mayavi/pull/1330 --- .github/workflows/main.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index a9959cd93..670fae179 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -4,10 +4,10 @@ on: - cron: "0 0 * * *" push: branches: - - master + - main pull_request: branches: - - master + - main jobs: script: runs-on: ubuntu-latest @@ -39,10 +39,10 @@ jobs: private-key: ${{ secrets.SSH_PRIVATE_KEY }} - name: install run: | - (cd mayavi; git fetch origin; git checkout master; git reset --hard origin/master; git branch -a) + (cd mayavi; git fetch origin; git checkout main; git reset --hard origin/main; git branch -a) pip3 install -U pip setuptools pip3 install -r ./requirements.txt - curl -o- https://raw.githubusercontent.com/transifex/cli/master/install.sh | bash + curl -o- https://raw.githubusercontent.com/transifex/cli/main/install.sh | bash mv tx /usr/local/bin/tx - name: update env: @@ -57,7 +57,7 @@ jobs: git config --global user.email $GITHUB_REPOSITORY git config --global user.name $GITHUB_REPOSITORY - name: commit - if: contains(github.event.head_commit.message, '[ci skip]') == false && contains(github.ref, 'master') + if: contains(github.event.head_commit.message, '[ci skip]') == false && contains(github.ref, 'main') env: JOB_ID: ${{ steps.jobs.outputs.job_id }} HTML_URL: ${{ steps.jobs.outputs.html_url }} @@ -67,4 +67,4 @@ jobs: $HTML_URL" git remote -v git remote add github git@github.com:$GITHUB_REPOSITORY.git - git push github master + git push github main From da680603e4b8ae2501cb1b65def6beda17727055 Mon Sep 17 00:00:00 2001 From: Tetsuo Koyama Date: Tue, 7 Jan 2025 15:47:19 +0900 Subject: [PATCH 2/2] Update main.yml --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 670fae179..0e7b2488b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -42,7 +42,7 @@ jobs: (cd mayavi; git fetch origin; git checkout main; git reset --hard origin/main; git branch -a) pip3 install -U pip setuptools pip3 install -r ./requirements.txt - curl -o- https://raw.githubusercontent.com/transifex/cli/main/install.sh | bash + curl -o- https://raw.githubusercontent.com/transifex/cli/master/install.sh | bash mv tx /usr/local/bin/tx - name: update env: