Skip to content

Commit

Permalink
created development branch
Browse files Browse the repository at this point in the history
  • Loading branch information
SilenZcience committed Feb 14, 2024
1 parent 0f9d2d8 commit 5ef05c6
Show file tree
Hide file tree
Showing 5 changed files with 30 additions and 19 deletions.
12 changes: 8 additions & 4 deletions .github/workflows/build_executable.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
11 changes: 6 additions & 5 deletions .github/workflows/coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down
9 changes: 5 additions & 4 deletions .github/workflows/package_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Expand All @@ -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
Expand Down
10 changes: 7 additions & 3 deletions .github/workflows/social_preview.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
7 changes: 4 additions & 3 deletions .github/workflows/unit_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Expand Down

0 comments on commit 5ef05c6

Please sign in to comment.