Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
1fc490d
Remove PR Actions Run, Add Tag Actions Run
WillXuCodes Jun 2, 2023
eb14bfc
Remove comment
WillXuCodes Jun 2, 2023
7d5ce94
Fix tags spelling
WillXuCodes Jun 2, 2023
b46aad6
Indented
WillXuCodes Jun 2, 2023
32edd93
Add all branches
WillXuCodes Jun 2, 2023
20d51d6
Attempting to fix tags
WillXuCodes Jun 3, 2023
ba23719
Fix attempt 2
WillXuCodes Jun 3, 2023
9583483
Throwing at the wall and seeing if it sticks
WillXuCodes Jun 3, 2023
a817193
reee
WillXuCodes Jun 3, 2023
83455f7
Fix deprecation warning
WillXuCodes Jun 3, 2023
6238ad3
Fix statement properly
WillXuCodes Jun 3, 2023
781b0b2
Add new job for the tag
WillXuCodes Jun 3, 2023
6344d17
What I meant to do
WillXuCodes Jun 3, 2023
7313a49
Fix actual tag generation
WillXuCodes Jun 3, 2023
6412dc6
Fix tabbing
WillXuCodes Jun 3, 2023
f8c9b11
Sanity check
WillXuCodes Jun 3, 2023
2e7a218
Sanity fix?
WillXuCodes Jun 3, 2023
c25a8d6
re sanity check
WillXuCodes Jun 3, 2023
44d56cd
Sanity check check
WillXuCodes Jun 3, 2023
5681bf2
OK PLEASE WORK
WillXuCodes Jun 3, 2023
17632a8
Back to the "throw stuff at the wall" approach
WillXuCodes Jun 3, 2023
6942425
Attempt to fix tag
WillXuCodes Jun 3, 2023
e036084
Try again
WillXuCodes Jun 3, 2023
9fe1494
add back newline
WillXuCodes Jun 3, 2023
cdfe4b5
Attempt fix
WillXuCodes Jun 3, 2023
aeb372f
ATTEMPT FIX AGAIN
WillXuCodes Jun 3, 2023
9b69f2e
Attempt the same thing but with the actual name of ref
WillXuCodes Jun 3, 2023
e150a94
Debug print
WillXuCodes Jun 3, 2023
2c6754d
Disable redundant version.py call
WillXuCodes Jun 4, 2023
6d9e0c3
Try a different approach
WillXuCodes Jun 4, 2023
fa7b82b
update versions
ayushuk Jun 4, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 16 additions & 4 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
name: Build PROS CLI

on:
# make github actions run on every push and every tag
push:
pull_request:
tags:
- '*'
branches:
- '**'

jobs:
update_build_number:
Expand All @@ -17,7 +21,8 @@ jobs:
id: step1
run: |
python3 version.py
echo "::set-output name=test::$(cat version)"
echo "test=$(cat version)" >> $GITHUB_OUTPUT
if: github.ref_type != 'tag'

build:
needs: update_build_number
Expand Down Expand Up @@ -62,7 +67,7 @@ jobs:

- name: Run Pyinstaller
run: |
python3 version.py
# python3 version.py
pyinstaller pros.spec
pyinstaller --onefile pros/cli/compile_commands/intercept-cc.py --name=intercept-cc
pyinstaller --onefile pros/cli/compile_commands/intercept-cc.py --name=intercept-c++
Expand All @@ -73,7 +78,7 @@ jobs:
pip3 uninstall -y charset_normalizer
git clone https://github.com/Ousret/charset_normalizer.git
pip3 install -e ./charset_normalizer
python3 version.py
# python3 version.py
pyinstaller pros-macos.spec
pyinstaller --onefile pros/cli/compile_commands/intercept-cc.py --name=intercept-cc --target-arch=universal2
pyinstaller --onefile pros/cli/compile_commands/intercept-cc.py --name=intercept-c++ --target-arch=universal2
Expand All @@ -91,3 +96,10 @@ jobs:
with:
name: ${{ matrix.os }}-${{needs.update_build_number.outputs.output1}}
path: dist/*
if: matrix.os != 'macos-latest'
- name: Upload Artifact (Tagged Version Naming)
uses: actions/upload-artifact@v3.1.0
with:
name: ${{ matrix.os }}-${{github.ref_name}}
path: dist/*
if: github.ref_type == 'tag'
2 changes: 1 addition & 1 deletion pip_version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.4.2
3.4.3
2 changes: 1 addition & 1 deletion version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.4.2
3.4.3
2 changes: 1 addition & 1 deletion win_version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.4.2.0
3.4.3.0