diff --git a/.github/workflows/build_executable.yml b/.github/workflows/build_executable.yml index d9ba9b24..b4fd9f01 100644 --- a/.github/workflows/build_executable.yml +++ b/.github/workflows/build_executable.yml @@ -11,6 +11,8 @@ jobs: steps: - name: Git Checkout uses: actions/checkout@v4 + with: + ref: 'dev' - name: Install Python 3.10 id: python uses: actions/setup-python@v5 @@ -28,21 +30,23 @@ jobs: python -m pip install --upgrade -r ./workflowHelper/requirements.txt - name: Setup Version File run: | - python ./workflowHelper/exeversion.py + python -m workflowHelper.exeversion - name: Compile Package run: | - python ./workflowHelper/build.py + python -m workflowHelper.build - name: Test Executable run: | ./bin/catw.exe -h ./bin/catw.exe -v ./bin/catw.exe -p ./bin/catw.exe -R --debug - - name: Show and Push + - name: Show Changes run: | git status + - name: Commit Changes + run: | git config --local user.name 'github-actions[bot]' git config --local user.email 'github-actions[bot]@users.noreply.github.com' git add ./bin/* git commit -m "🤖Compiled Binary." - git push origin HEAD:main + git push origin HEAD:dev continue-on-error: true diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index 829adf3e..b717cb3c 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -6,11 +6,9 @@ on: paths: - .github/workflows/coverage.yml - cat_win/** - # specify (all) branches such that the workflow will - # not trigger on tag/release-creation + # only trigger on development branch branches: - - '**' - - '!badges' + - 'dev' jobs: build: @@ -25,6 +23,7 @@ jobs: uses: actions/checkout@v4 with: fetch-depth: 0 # otherwise, it will fail to push refs to dest repo + ref: 'dev' - name: Install Python 3.10 id: python uses: actions/setup-python@v5 @@ -55,9 +54,11 @@ jobs: run: | python -m genbadge.main tests -i ./reports/pytest.xml -o ./.github/badges/badge-tests.svg python -m genbadge.main coverage -i ./reports/coverage.xml -o ./.github/badges/badge-coverage.svg - - name: Show and Push + - name: Show Changes run: | git status + - name: Commit Changes + run: | git config --local user.name 'github-actions[bot]' git config --local user.email 'github-actions[bot]@users.noreply.github.com' git add ./.github/badges/badge-coverage.svg diff --git a/.github/workflows/package_test.yml b/.github/workflows/package_test.yml index d45945c0..928ef263 100644 --- a/.github/workflows/package_test.yml +++ b/.github/workflows/package_test.yml @@ -7,10 +7,9 @@ on: - .github/workflows/package_test.yml - cat_win/** - workflowHelper/** - # specify (all) branches such that the workflow will - # not trigger on tag/release-creation + # only trigger on development branch branches: - - '**' + - 'dev' jobs: build: @@ -24,6 +23,8 @@ jobs: steps: - name: Git Checkout uses: actions/checkout@v4 + with: + ref: 'dev' - name: Install Python ${{ matrix.python-version }} id: python uses: actions/setup-python@v5 @@ -42,7 +43,7 @@ jobs: - name: Install Local Package # this should also install the code dependency in requirements.txt run: | - python ./workflowHelper/dist.py + python -m workflowHelper.dist - name: Test Code Execution run: | python -m cat_win.cat -h diff --git a/.github/workflows/social_preview.yml b/.github/workflows/social_preview.yml index 46da6e7d..5f5a1eb9 100644 --- a/.github/workflows/social_preview.yml +++ b/.github/workflows/social_preview.yml @@ -13,6 +13,8 @@ jobs: steps: - name: Git Checkout uses: actions/checkout@v4 + with: + ref: 'dev' - name: Install Python 3.10 id: python uses: actions/setup-python@v5 @@ -27,13 +29,15 @@ jobs: python -m pip install --upgrade Pillow - name: Generate Social Preview run: | - python ./workflowHelper/preview.py - - name: Show and Push + python -m workflowHelper.preview + - name: Show Changes run: | git status + - name: Commit Changes + run: | git config --local user.name 'github-actions[bot]' git config --local user.email 'github-actions[bot]@users.noreply.github.com' git add ./img/socialPreview.png git commit -m "🤖Generated Social Preview." - git push origin HEAD:main + git push origin HEAD:dev continue-on-error: true diff --git a/.github/workflows/unit_test.yml b/.github/workflows/unit_test.yml index f302d61a..dc5bf3ec 100644 --- a/.github/workflows/unit_test.yml +++ b/.github/workflows/unit_test.yml @@ -7,10 +7,9 @@ on: - .github/workflows/unit_test.yml - cat_win/** - workflowHelper/** - # specify (all) branches such that the workflow will - # not trigger on tag/release-creation + # only trigger on development branch branches: - - '**' + - 'dev' jobs: build: @@ -26,6 +25,8 @@ jobs: git config --global core.autocrlf true - name: Git Checkout uses: actions/checkout@v4 + with: + ref: 'dev' - name: Install Python ${{ matrix.python-version }} id: python uses: actions/setup-python@v5