Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixed typo in build scripts #2337

Merged
merged 1 commit into from
Oct 9, 2023
Merged

Fixed typo in build scripts #2337

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 2 additions & 6 deletions .github/workflows/release.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,8 @@ jobs:
export CHANGELIST=""
echo "Packaging version ${REVISION}${CHANGELIST}"
mvn package -pl ugs-classic assembly:assembly -DskipTests=true -Drevision=${REVISION} -Dchangelist=${CHANGELIST}
mvn package -pl ugs-platform/application -P create-macosx-package -DskipTests=true -Drevision=${REVISION} -Dchangelist=${CHANGELIST}
mvn package -pl ugs-platform/application -P create-win32-package -DskipTests=true -Drevision=${REVISION} -Dchangelist=${CHANGELIST}
mvn package -pl ugs-platform/application -P create-win64-package -DskipTests=true -Drevision=${REVISION} -Dchangelist=${CHANGELIST}
mvn package -pl ugs-platform/application -P create-linux-package -DskipTests=true -Drevision=${REVISION} -Dchangelist=${CHANGELIST}
mvn package -pl ugs-platform/application -P create-pi-package -DskipTests=true -Drevision=${REVISION} -Dchangelist=${CHANGELIST}

mvn package -pl ugs-platform/application -P create-macosx-x64-package,create-macosx-aarch64-package,create-win32-package,create-win64-package,create-linux-x64-package,create-linux-arm-package,create-linux-aarch64-package -DskipTests=true

# https://github.com/marketplace/actions/upload-to-github-release
- name: Upload binaries to snapshot release
uses: xresloader/upload-to-github-release@v1
Expand Down
8 changes: 4 additions & 4 deletions ugs-platform/application/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -421,7 +421,7 @@
<delete includeEmptyDirs="true" failonerror="false" removeNotFollowedSymlinks="true">
<fileset dir="${project.build.directory}/${ugs.appbundle.name}.app" followsymlinks="false"/>
<fileset dir="${project.build.directory}/${ugs.app.title}" followsymlinks="false"/>
<fileset dir="${project.build.directory}/macos-x64-${project.artifactId}-${project.version}.dmg" followsymlinks="false"/>
<fileset dir="${project.build.directory}/macosx-x64-${project.artifactId}-${project.version}.dmg" followsymlinks="false"/>
</delete>

<!-- Create folders -->
Expand Down Expand Up @@ -515,7 +515,7 @@
<arg value="${ugs.appbundle.name}"/>
<arg value="-r"/>
<arg value="-o"/>
<arg value="macos-x64-${project.artifactId}-${project.version}.dmg"/>
<arg value="macosx-x64-${project.artifactId}-${project.version}.dmg"/>
<arg value="${project.build.directory}/${ugs.app.title}"/>
</exec>
</target>
Expand Down Expand Up @@ -549,7 +549,7 @@
<delete includeEmptyDirs="true" failonerror="false" removeNotFollowedSymlinks="true">
<fileset dir="${project.build.directory}/${ugs.appbundle.name}.app" followsymlinks="false"/>
<fileset dir="${project.build.directory}/${ugs.app.title}" followsymlinks="false"/>
<fileset dir="${project.build.directory}/macos-aarch64-${project.artifactId}-${project.version}.dmg" followsymlinks="false"/>
<fileset dir="${project.build.directory}/macosx-aarch64-${project.artifactId}-${project.version}.dmg" followsymlinks="false"/>
</delete>

<!-- Create folders -->
Expand Down Expand Up @@ -643,7 +643,7 @@
<arg value="${ugs.appbundle.name}"/>
<arg value="-r"/>
<arg value="-o"/>
<arg value="macos-aarch64-${project.artifactId}-${project.version}.dmg"/>
<arg value="macosx-aarch64-${project.artifactId}-${project.version}.dmg"/>
<arg value="${project.build.directory}/${ugs.app.title}"/>
</exec>
</target>
Expand Down