Skip to content

Commit

Permalink
Merge branch 'current' into future/ws24
Browse files Browse the repository at this point in the history
  • Loading branch information
kostrykin committed Feb 19, 2024
2 parents 49a0c1e + 460632b commit 8bad508
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 29 deletions.
17 changes: 0 additions & 17 deletions .github/create-future-branch.py

This file was deleted.

2 changes: 1 addition & 1 deletion .github/init-future-branch.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
args = parser.parse_args()

try:
term = re.match(r'^future-(?:[ws]{2})-?(?:20)?([0-9]{2})$', args.branch).group(1)
term = re.match(r'^future/(?:[ws]{2})-?(?:20)?([0-9]{2})$', args.branch).group(1)
term = int(term)
except AttributeError:
print(f'Malformed branch name: "{args.branch}"')
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/build_assignments.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,9 @@ jobs:
- name: Initialize
uses: actions/checkout@v4

- uses: kostrykin/build-latex-document-action@master
- uses: kostrykin/build-latex-document-action@v1.1.1
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
working_directory: assignments
document_filename: assignments.pdf
sources: |
Expand Down
10 changes: 2 additions & 8 deletions .github/workflows/create_future_branch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,6 @@ jobs:
uses: actions/checkout@v4

- name: Create and initialize future branch
run: echo "branch=$(python .github/create-future-branch.py)" >> $GITHUB_OUTPUT
id: create_branch

- name: Commit and push
uses: stefanzweifel/git-auto-commit-action@v5
uses: kostrykin/create-future-branch-action@master
with:
branch: ${{ steps.create_branch.outputs.branch }}
commit_message: 'Initialize future branch'
create_branch: true
init: python .github/init-future-branch.py
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@

**If you want to make some changes for the next year:**
1. Update the code (as described above)
2. Create the pull request against the corresponding `future-*` branch
3. Merge the `future-*` branch to the `current` branch in time before the course starts
2. Create the pull request against the corresponding `future/*` branch
3. Merge the `future/*` branch to the `current` branch in time before the course starts

0 comments on commit 8bad508

Please sign in to comment.