Skip to content

Commit 1538333

Browse files
PhilMFischerPhilMFischer
authored
Merge pull request #82 from virtualsatellite/feature/task_81-Make_linux_version_of_
Linuix buuilds have correct permissions now
2 parents b64c7c8 + 0ce58ea commit 1538333

File tree

3 files changed

+50
-48
lines changed

3 files changed

+50
-48
lines changed

‎.github/workflows/main.yml

Lines changed: 11 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,6 @@ jobs:
8080
with:
8181
java-version: 17
8282
distribution: "temurin"
83-
cache: 'maven'
8483

8584
- name: Setup - Maven 3.9.6
8685
uses: virtualsatellite/ci-actions/ci-maven-setup@v7
@@ -100,34 +99,23 @@ jobs:
10099
# --------------------------------------------
101100
# Setup caching for m2 repository
102101
# --------------------------------------------
103-
# - name: Setup - Cache local m2 repository
104-
# uses: actions/[email protected]
105-
# with:
106-
# cache-always: true
107-
# path: ~/.m2/repository/
108-
# key: ${{ runner.os }}-local-m2-deploy-${{ hashFiles('**/pom.xml') }}
109-
# restore-keys: |
110-
# ${{ runner.os }}-local-m2-deploy-
111-
# ${{ runner.os }}-local-m2-
102+
- name: Setup - Cache local m2 and p2 repository
103+
uses: actions/[email protected]
104+
with:
105+
save-always: true
106+
path: |
107+
./p2Repo
108+
~/.m2/repository/
109+
key: ${{ runner.os }}-local-m2-deploy-${{ hashFiles('**/pom.xml') }}
110+
restore-keys: |
111+
${{ runner.os }}-local-m2-p2-deploy-
112+
${{ runner.os }}-local-m2-p2-
112113
113114
- name: Setup - Clean local m2 repository
114115
run: |
115116
ls -d ~/.m2/repository/*/*/* || true
116117
rm -rf ~/.m2/repository/de/dlr/sc/virsat
117118
118-
# --------------------------------------------
119-
# Setup caching for p2 repository
120-
# --------------------------------------------
121-
- name: Setup - Cache local p2 repository
122-
uses: actions/[email protected]
123-
with:
124-
path: ./p2Repo
125-
save-always: true
126-
key: ${{ runner.os }}-local-p2-deploy-${{ hashFiles('**/pom.xml') }}
127-
restore-keys: |
128-
${{ runner.os }}-local-p2-deploy-
129-
${{ runner.os }}-local-p2-
130-
131119
# --------------------------------------------
132120
# Perform various setup operations
133121
# --------------------------------------------

‎de.dlr.sc.virsat.ide.product/pom.xml

Lines changed: 36 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,9 @@
2323

2424
<properties>
2525
<build.folder.application>VirSatIDEBinary</build.folder.application>
26-
<build.folder.fullpath>${build.folder.target.bin}/${build.folder.application}/${build.folder.type}</build.folder.fullpath>
27-
<build.file.win32.fullpath>${build.folder.target.bin}/${build.folder.application}/${build.folder.type}/${build.file.win32}</build.file.win32.fullpath>
28-
<build.file.linux.fullpath>${build.folder.target.bin}/${build.folder.application}/${build.folder.type}/${build.file.linux}</build.file.linux.fullpath>
29-
26+
<build.folder.fullpath.bin>${build.folder.target.bin}/${build.folder.application}/${build.folder.type}</build.folder.fullpath.bin>
27+
<build.file.fullpath>${build.folder.target.bin}/${build.folder.application}/${build.folder.type}/${build.file}</build.file.fullpath>
28+
3029
<build.folder.application.p2>VirSat4_IDE</build.folder.application.p2>
3130
<build.folder.fullpath.p2>${build.folder.target.p2}/${build.folder.application.p2}/${build.folder.type}</build.folder.fullpath.p2>
3231
</properties>
@@ -38,6 +37,28 @@
3837
<plugin>
3938
<groupId>org.eclipse.tycho</groupId>
4039
<artifactId>tycho-p2-director-plugin</artifactId>
40+
<executions>
41+
<execution>
42+
<id>create-distributions</id>
43+
<goals>
44+
<goal>materialize-products</goal>
45+
<goal>archive-products</goal>
46+
</goals>
47+
</execution>
48+
</executions>
49+
<configuration>
50+
<formats>
51+
<linux>tar.gz</linux>
52+
<win32>zip</win32>
53+
</formats>
54+
<products>
55+
<product>
56+
<id>de.dlr.sc.virsat.ide.product</id>
57+
<rootFolder>eclipse</rootFolder>
58+
<archiveFileName>${build.file}</archiveFileName>
59+
</product>
60+
</products>
61+
</configuration>
4162
</plugin>
4263

4364
<plugin>
@@ -49,7 +70,7 @@
4970
<configuration>
5071
<target>
5172
<fail
52-
message="Cannot Release!!! Release folder already exists !!! Potential overwrite to ${build.folder.fullpath} !!!">
73+
message="Cannot Release!!! Release folder already exists !!! Potential overwrite to ${build.folder.fullpath.p2} !!!">
5374
<condition>
5475
<and>
5576
<equals arg1="${build.deploy.release}" arg2="true" />
@@ -74,28 +95,24 @@
7495
<configuration>
7596
<target>
7697
<fail
77-
message="Cannot Release!!! Release folder already exists !!! Potential overwrite to ${build.folder.fullpath} !!!">
98+
message="Cannot Release!!! Release folder already exists !!! Potential overwrite to ${build.folder.fullpath.bin} !!!">
7899
<condition>
79100
<and>
80101
<equals arg1="${build.deploy.release}" arg2="true" />
81-
<available file="${build.folder.fullpath}" type="dir" />
102+
<available file="${build.folder.fullpath.bin}" type="dir" />
82103
</and>
83104
</condition>
84105
</fail>
85106

86107
<!-- ANT Script Start -->
87-
<mkdir dir="${build.folder.fullpath}" />
88-
89-
<delete file="${build.file.win32.fullpath}" />
90-
<delete file="${build.file.linux.fullpath}" />
91-
92-
<zip destfile="${build.file.win32.fullpath}"
93-
basedir="./target/products/de.dlr.sc.virsat.ide.product/win32/win32/x86_64" />
94-
<tar destfile="${build.file.linux.fullpath}"
95-
basedir="./target/products/de.dlr.sc.virsat.ide.product/linux/gtk/x86_64"
96-
compression="gzip"
97-
longfile="gnu" />
98-
<!-- ANT Script Stop -->
108+
<delete dir="${build.folder.fullpath.bin}" />
109+
<copy toDir="${build.folder.fullpath.bin}">
110+
<fileset dir="./target/products/">
111+
<include name="*.tar.gz"/>
112+
<include name="*.zip"/>
113+
</fileset>
114+
</copy>
115+
99116
</target>
100117
</configuration>
101118
<goals>

‎maven/pom.xml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,7 @@
7272
<build.qualifier>'d'yyyyMMddHHmm</build.qualifier>
7373
<maven.build.timestamp.format>'d'yyyyMMddHHmm</maven.build.timestamp.format>
7474
<build.folder.type>development</build.folder.type>
75-
<build.file.win32>VirSat_IDE_Development_Win32.zip</build.file.win32>
76-
<build.file.linux>VirSat_IDE_Development_Linux.tar.gz</build.file.linux>
75+
<build.file>VirSat_IDE_Development</build.file>
7776
<p2.repo.virsat.id>DVLM-Tools-Feature-Development</p2.repo.virsat.id>
7877
<p2.repo.virsat.url>https://sourceforge.net/projects/virtualsatellite/files/VirtualSatellite4-DVLM/development/</p2.repo.virsat.url>
7978
<!-- p2.repo.virsat.url>file:/C:/git/VirtualSatellite4-Core/builds/p2/VirSat4_Dvlm_ConceptIDE/development</p2.repo.virsat.url -->
@@ -87,8 +86,7 @@
8786
<build.qualifier>'i'yyyyMMddHHmm</build.qualifier>
8887
<maven.build.timestamp.format>'i'yyyyMMddHHmm</maven.build.timestamp.format>
8988
<build.folder.type>integration/${build.version}</build.folder.type>
90-
<build.file.win32>VirSat_IDE_Integration_${build.version}_Win32.zip</build.file.win32>
91-
<build.file.linux>VirSat_IDE_Integration_${build.version}_Linux.tar.gz</build.file.linux>
89+
<build.file>VirSat_IDE_Integration_${build.version}</build.file>
9290
<p2.repo.virsat.id>DVLM-Tools-Feature-Integration</p2.repo.virsat.id>
9391
<p2.repo.virsat.url>https://sourceforge.net/projects/virtualsatellite/files/VirtualSatellite4-DVLM/integration/${build.version}/</p2.repo.virsat.url>
9492
<p2.repo.overtarget.id>Overtarget-Feature-Integration</p2.repo.overtarget.id>
@@ -102,8 +100,7 @@
102100
<build.qualifier>'r'yyyyMMddHHmm</build.qualifier>
103101
<maven.build.timestamp.format>'r'yyyyMMddHHmm</maven.build.timestamp.format>
104102
<build.folder.type>release/${build.version}/${env.GITHUB_SHA}</build.folder.type>
105-
<build.file.win32>VirSat_IDE_Release_${build.version}_${env.GITHUB_SHA}_Win32.zip</build.file.win32>
106-
<build.file.linux>VirSat_IDE_Release_${build.version}_${env.GITHUB_SHA}_Linux.tar.gz</build.file.linux>
103+
<build.file>VirSat_IDE_Release_${build.version}_${env.GITHUB_SHA}</build.file>
107104
<p2.repo.virsat.id>DVLM-Tools-Feature-Release</p2.repo.virsat.id>
108105
<p2.repo.virsat.url>https://sourceforge.net/projects/virtualsatellite/files/VirtualSatellite4-DVLM/release/${build.version}/24188989bef19563442734fd0bd66431ccff11b9</p2.repo.virsat.url>
109106
<p2.repo.overtarget.id>Overtarget-Feature-Release</p2.repo.overtarget.id>

0 commit comments

Comments
 (0)