Skip to content

Commit 55a7d2a

Browse files
jadeandteajadeandtea
authored
Merge branch 'dev' into star-battle
2 parents 1c681b5 + 3ac9d91 commit 55a7d2a

File tree

370 files changed

+4246
-1836
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

370 files changed

+4246
-1836
lines changed

‎.github/workflows/version-changer.yml‎

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
name: Increment Version on PR to Master
2+
3+
on:
4+
pull_request:
5+
branches:
6+
- master
7+
types:
8+
- closed # Runs only when PR is merged
9+
10+
jobs:
11+
increment_version:
12+
if: github.event.pull_request.merged == true
13+
runs-on: ubuntu-latest
14+
steps:
15+
- name: Checkout dev branch
16+
uses: actions/checkout@v2
17+
with:
18+
ref: dev
19+
fetch-depth: 0
20+
21+
- name: Determine new version
22+
id: update_version
23+
run: |
24+
current_version=$(<legup-update/bin/main/edu.rpi.legupupdate/VERSION)
25+
IFS='.' read -r -a version_parts <<< "$current_version"
26+
first_part="${version_parts[0]}"
27+
second_part="${version_parts[1]}"
28+
last_part="${version_parts[2]}"
29+
30+
if [[ $last_part -eq 9 ]]; then
31+
new_last_part=0
32+
if [[ $second_part -eq 9 ]]; then
33+
new_second_part=0
34+
new_first_part=$((first_part + 1))
35+
else
36+
new_second_part=$((second_part + 1))
37+
new_first_part=$first_part
38+
fi
39+
else
40+
new_last_part=$((last_part + 1))
41+
new_second_part=$second_part
42+
new_first_part=$first_part
43+
fi
44+
45+
new_version="$new_first_part.$new_second_part.$new_last_part"
46+
echo "New version: $new_version"
47+
echo "::set-output name=version::$new_version"
48+
49+
- name: Update VERSION file
50+
run: echo "${{ steps.update_version.outputs.version }}" > legup-update/bin/main/edu.rpi.legupupdate/VERSION
51+
52+
- name: Commit and push changes to dev
53+
run: |
54+
git config --global user.name 'Bram van Heuveln'
55+
git config --global user.email 'bram28@users.noreply.github.com'
56+
git remote set-url origin https://x-access-token:${{ secrets.GITHUB_TOKEN }}@github.com/${{ github.repository }} # check this, the rest should work
57+
git add legup-update/bin/main/edu.rpi.legupupdate/VERSION
58+
git commit -m "Increment version number after PR to master"

‎.gitignore‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,5 +92,4 @@ gradle-app.setting
9292
gradle/wrapper/gradle-wrapper.properties
9393

9494
# Visual Studio Code configs
95-
.vscode/*
96-
src/test/java/legup/TestRunner.java
95+
.vscode/*

‎.settings/org.eclipse.buildship.core.prefs‎

Lines changed: 0 additions & 13 deletions
This file was deleted.

‎legup-update/bin/main/edu.rpi.legupupdate/VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.0.0
1+
6.0.1

‎puzzles files/binary/10x10 Binary Hard/10x10 Binary Hard 1‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
21
<Legup version="3.0.0">
32
<saved/>
4-
<puzzle name="Binary">
3+
<puzzle name="Binary" tag="10x10 Binary Hard 1">
54
<board height="10" width="10">
65
<cells>
76
<cell value="2" x="0" y="0"/>
@@ -107,5 +106,5 @@
107106
</cells>
108107
</board>
109108
</puzzle>
110-
<solved isSolved="false" lastSaved="2024-07-19 00:12:25"/>
111-
</Legup>
109+
<solved isSolved="-2010495071" lastSaved="2024-11-08 17:14:34"/>
110+
</Legup>

‎puzzles files/binary/10x10 Binary Hard/10x10 Binary Hard 2‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
21
<Legup version="3.0.0">
32
<saved/>
4-
<puzzle name="Binary">
3+
<puzzle name="Binary" tag="10x10 Binary Hard 2">
54
<board height="10" width="10">
65
<cells>
76
<cell value="2" x="0" y="0"/>
@@ -107,5 +106,5 @@
107106
</cells>
108107
</board>
109108
</puzzle>
110-
<solved isSolved="false" lastSaved="2024-07-26 14:44:39"/>
111-
</Legup>
109+
<solved isSolved="-2010495071" lastSaved="2024-11-08 17:14:34"/>
110+
</Legup>

‎puzzles files/binary/10x10 Binary Hard/10x10 Binary Hard 3‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
21
<Legup version="3.0.0">
32
<saved/>
4-
<puzzle name="Binary">
3+
<puzzle name="Binary" tag="10x10 Binary Hard 3">
54
<board height="10" width="10">
65
<cells>
76
<cell value="2" x="0" y="0"/>
@@ -107,5 +106,5 @@
107106
</cells>
108107
</board>
109108
</puzzle>
110-
<solved isSolved="false" lastSaved="2024-07-26 14:45:38"/>
111-
</Legup>
109+
<solved isSolved="-2010495071" lastSaved="2024-11-08 17:14:34"/>
110+
</Legup>

‎puzzles files/binary/10x10 Binary Medium/10x10 Binary Medium 1‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
21
<Legup version="3.0.0">
32
<saved/>
4-
<puzzle name="Binary">
3+
<puzzle name="Binary" tag="10x10 Binary Medium 1">
54
<board height="10" width="10">
65
<cells>
76
<cell value="2" x="0" y="0"/>
@@ -107,5 +106,5 @@
107106
</cells>
108107
</board>
109108
</puzzle>
110-
<solved isSolved="false" lastSaved="2024-07-26 14:41:51"/>
111-
</Legup>
109+
<solved isSolved="-2010495071" lastSaved="2024-11-08 17:14:34"/>
110+
</Legup>

‎puzzles files/binary/10x10 Binary Medium/10x10 Binary Medium 2‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
21
<Legup version="3.0.0">
32
<saved/>
4-
<puzzle name="Binary">
3+
<puzzle name="Binary" tag="10x10 Binary Medium 2">
54
<board height="10" width="10">
65
<cells>
76
<cell value="2" x="0" y="0"/>
@@ -107,5 +106,5 @@
107106
</cells>
108107
</board>
109108
</puzzle>
110-
<solved isSolved="false" lastSaved="2024-07-26 14:42:37"/>
111-
</Legup>
109+
<solved isSolved="-2010495071" lastSaved="2024-11-08 17:14:34"/>
110+
</Legup>

‎puzzles files/binary/10x10 Binary Medium/10x10 Binary Medium 3‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
21
<Legup version="3.0.0">
32
<saved/>
4-
<puzzle name="Binary">
3+
<puzzle name="Binary" tag="10x10 Binary Medium 3">
54
<board height="10" width="10">
65
<cells>
76
<cell value="2" x="0" y="0"/>
@@ -107,5 +106,5 @@
107106
</cells>
108107
</board>
109108
</puzzle>
110-
<solved isSolved="false" lastSaved="2024-07-26 14:43:32"/>
111-
</Legup>
109+
<solved isSolved="-2010495071" lastSaved="2024-11-08 17:14:34"/>
110+
</Legup>

0 commit comments

Comments
 (0)