Skip to content

Commit e2e736c

Browse files
authored
Merge pull request #2 from UncleSema/master
Автоопределение системы в Maven
2 parents d2644a5 + 59ec706 commit e2e736c

File tree

2 files changed

+11
-5
lines changed

2 files changed

+11
-5
lines changed

.github/workflows/github-actions.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
with:
1111
java-version: '17'
1212
- name: Build with Maven
13-
run: mvn -B package -P linux --file pom.xml
13+
run: mvn package
1414
- name: Get job's artifacts
1515
uses: actions/upload-artifact@v2
1616
with:
@@ -26,7 +26,7 @@ jobs:
2626
with:
2727
java-version: '17'
2828
- name: Build with Maven
29-
run: mvn -B package -P mac --file pom.xml
29+
run: mvn package
3030
- name: Get job's artifacts
3131
uses: actions/upload-artifact@v2
3232
with:
@@ -42,7 +42,7 @@ jobs:
4242
with:
4343
java-version: '17'
4444
- name: Build with Maven
45-
run: mvn -B package -P win --file pom.xml
45+
run: mvn package
4646
- name: Get job's artifacts
4747
uses: actions/upload-artifact@v2
4848
with:
@@ -51,6 +51,7 @@ jobs:
5151
Release:
5252
runs-on: ubuntu-latest
5353
needs: [Linux-Artifact, Mac-Artifact, Windows-Artifact]
54+
if: startsWith(github.ref, 'refs/tags/')
5455
steps:
5556
- name: Download Linux artifact
5657
uses: actions/download-artifact@v2
@@ -78,7 +79,6 @@ jobs:
7879

7980
- name: Release
8081
uses: softprops/action-gh-release@v1
81-
if: startsWith(github.ref, 'refs/tags/')
8282
with:
8383
draft: true
8484
files: |

pom.xml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,20 +20,26 @@
2020
<profile>
2121
<id>win</id>
2222
<activation>
23-
<activeByDefault>true</activeByDefault>
23+
<os><family>windows</family></os>
2424
</activation>
2525
<properties>
2626
<javafx.platform>win</javafx.platform>
2727
</properties>
2828
</profile>
2929
<profile>
3030
<id>linux</id>
31+
<activation>
32+
<os><family>unix</family></os>
33+
</activation>
3134
<properties>
3235
<javafx.platform>linux</javafx.platform>
3336
</properties>
3437
</profile>
3538
<profile>
3639
<id>mac</id>
40+
<activation>
41+
<os><family>mac</family></os>
42+
</activation>
3743
<properties>
3844
<javafx.platform>mac</javafx.platform>
3945
</properties>

0 commit comments

Comments
 (0)