Skip to content

Commit a1a41b7

Browse files
authored
Merge commit from fork
Advisory fix 1
2 parents 6a64554 + cc80f1f commit a1a41b7

File tree

1 file changed

+10
-3
lines changed

1 file changed

+10
-3
lines changed

.github/workflows/remoteBuild.yml

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -292,6 +292,7 @@ jobs:
292292
mv AdeptConfig/adept.config stage/adept.config
293293
mv AdeptImport stage/import
294294
mv LICENSE stage/LICENSE
295+
find stage -type d -name ".git" -exec rm -rf {} +
295296
- name: Install Inno Setup
296297
run: choco install innosetup
297298
- name: Package as Installer
@@ -373,12 +374,14 @@ jobs:
373374
mv ../AdeptCrossCompilation-MacOS-to-Windows/cross-compile-windows stage/application/cross-compile-windows
374375
mv ../AdeptConfig/adept.config stage/application/adept.config
375376
mv ../build/adept stage/application/adept
377+
find stage -type d -name ".git" -exec rm -rf {} +
376378
- name: Stage Installer Files
377379
working-directory: ${{github.workspace}}/macOS-installer-builder
378380
run: |
379381
sed -i '' -e 's/Adept 2.6/${{env.fullName}}/g' stage/installer/welcome.html
380382
sed -i '' -e 's/Adept 2.6/${{env.fullName}}/g' -e s/adept2-6/${{env.alternativeBinaryName}}/g stage/installer/conclusion.html
381383
sed -i '' -e s/adept2-6/${{env.alternativeBinaryName}}/g -e s/2.6.0/${{env.longVersion}}/g stage/installer/postinstall
384+
find stage -type d -name ".git" -exec rm -rf {} +
382385
- name: Package as Installer
383386
working-directory: ${{github.workspace}}/macOS-installer-builder
384387
run: |
@@ -387,8 +390,9 @@ jobs:
387390
- name: Package as Standalone
388391
working-directory: ${{github.workspace}}/macOS-installer-builder
389392
run: |
393+
find stage -type d -name ".git" -exec rm -rf {} +
390394
mv stage/application adept-${{env.shortVersion}}-standalone
391-
zip -vr Adept-${{env.shortVersion}}-standalone-arm64-MacOS.zip adept-${{env.shortVersion}}-standalone/ -x "*.DS_Store"
395+
zip -vr Adept-${{env.shortVersion}}-standalone-arm64-MacOS.zip adept-${{env.shortVersion}}-standalone/ -x "*.DS_Store" -x "*/.git/*"
392396
- name: Upload MacOS Installer Artifact
393397
uses: actions/upload-artifact@v4
394398
with:
@@ -500,12 +504,14 @@ jobs:
500504
cp ubuntu-latest/build/adept adept-${{env.shortVersion}}-standalone/adept
501505
mv AdeptConfig/adept.config adept-${{env.shortVersion}}-standalone/adept.config
502506
mv AdeptImport adept-${{env.shortVersion}}-standalone/import
503-
zip -r Adept-${{env.shortVersion}}-standalone-x86_64-Ubuntu.zip adept-${{env.shortVersion}}-standalone
507+
find adept-${{env.shortVersion}}-standalone -type d -name ".git" -exec rm -rf {} +
508+
zip -r Adept-${{env.shortVersion}}-standalone-x86_64-Ubuntu.zip adept-${{env.shortVersion}}-standalone -x "*/.git/*"
504509
- name: Package as Standalone for Ubuntu 22.04
505510
working-directory: ${{github.workspace}}
506511
run: |
507512
cp ubuntu-22.04/build/adept adept-${{env.shortVersion}}-standalone/adept
508-
zip -r Adept-${{env.shortVersion}}-standalone-x86_64-Ubuntu-22.04.zip adept-${{env.shortVersion}}-standalone
513+
find adept-${{env.shortVersion}}-standalone -type d -name ".git" -exec rm -rf {} +
514+
zip -r Adept-${{env.shortVersion}}-standalone-x86_64-Ubuntu-22.04.zip adept-${{env.shortVersion}}-standalone -x "*/.git/*"
509515
- name: Stage
510516
run: |
511517
mkdir stage
@@ -533,3 +539,4 @@ jobs:
533539
stage/Windows-x86_64-Standalone-Adept-${{env.shortVersion}}.zip
534540
stage/Ubuntu-x86_64-Standalone-Adept-${{env.shortVersion}}.zip
535541
stage/Ubuntu-22.04-x86_64-Standalone-Adept-${{env.shortVersion}}.zip
542+

0 commit comments

Comments
 (0)