Skip to content

Commit ea3bdb8

Browse files
authored
Merge pull request #234 from nafg/dereference-target-symlinks
Dereference symlinks when archiving target directories
2 parents 870ce57 + 975b61a commit ea3bdb8

16 files changed

Lines changed: 22 additions & 22 deletions

File tree

‎.github/workflows/ci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ jobs:
8282

8383
- name: Compress target directories
8484
shell: bash
85-
run: tar cf targets.tar target project/target
85+
run: tar chf targets.tar target project/target
8686

8787
- name: Upload target directories
8888
uses: actions/upload-artifact@v7

‎src/main/scala/sbtghactions/GenerativePlugin.scala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -697,7 +697,7 @@ ${indent(jobs.map(compileJob(_, sbt)).mkString("\n\n"), 1)}
697697
}
698698

699699
val tar = WorkflowStep.Run(
700-
List(s"tar cf targets.tar ${sanitized.mkString(" ")} project/target"),
700+
List(s"tar chf targets.tar ${sanitized.mkString(" ")} project/target"),
701701
name = Some("Compress target directories"))
702702

703703
val upload = WorkflowStep.Use(

‎src/sbt-test/sbtghactions/allow-hashes/.github/workflows/ci-modified.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252
run: sbt '++ ${{ matrix.scala }}; test'
5353

5454
- name: Compress target directories
55-
run: tar cf targets.tar target project/target
55+
run: tar chf targets.tar target project/target
5656

5757
- name: Upload target directories
5858
uses: actions/upload-artifact@v7

‎src/sbt-test/sbtghactions/allow-hashes/.github/workflows/ci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
run: sbt '++ ${{ matrix.scala }}; test'
5050

5151
- name: Compress target directories
52-
run: tar cf targets.tar target project/target
52+
run: tar chf targets.tar target project/target
5353

5454
- name: Upload target directories
5555
uses: actions/upload-artifact@v7

‎src/sbt-test/sbtghactions/check-and-regenerate/build.sbt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ TaskKey[Unit]("patchIfSbt2") := {
4343
IO.write(
4444
yml,
4545
IO.read(yml).replace(
46-
"run: tar cf targets.tar target project/target",
47-
s"run: tar cf targets.tar ${targetPath} project/target"
46+
"run: tar chf targets.tar target project/target",
47+
s"run: tar chf targets.tar ${targetPath} project/target"
4848
)
4949
)
5050
}

‎src/sbt-test/sbtghactions/check-and-regenerate/expected-ci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ jobs:
7171
- run: echo yo
7272

7373
- name: Compress target directories
74-
run: tar cf targets.tar target project/target
74+
run: tar chf targets.tar target project/target
7575

7676
- name: Upload target directories
7777
uses: actions/upload-artifact@v7

‎src/sbt-test/sbtghactions/githubworkflowoses-clean-publish/.github/workflows/ci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ jobs:
6565

6666
- name: Compress target directories
6767
shell: bash
68-
run: tar cf targets.tar target project/target
68+
run: tar chf targets.tar target project/target
6969

7070
- name: Upload target directories
7171
uses: actions/upload-artifact@v7

‎src/sbt-test/sbtghactions/githubworkflowoses-clean-publish/build.sbt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ TaskKey[Unit]("patchIfSbt2") := {
1414
IO.write(
1515
yml,
1616
IO.read(yml).replace(
17-
"run: tar cf targets.tar target project/target",
18-
s"run: tar cf targets.tar ${targetPath} project/target"
17+
"run: tar chf targets.tar target project/target",
18+
s"run: tar chf targets.tar ${targetPath} project/target"
1919
)
2020
)
2121
}

‎src/sbt-test/sbtghactions/no-clean/.github/workflows/ci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
run: sbt '++ ${{ matrix.scala }}; test'
5050

5151
- name: Compress target directories
52-
run: tar cf targets.tar target project/target
52+
run: tar chf targets.tar target project/target
5353

5454
- name: Upload target directories
5555
uses: actions/upload-artifact@v7

‎src/sbt-test/sbtghactions/no-clean/build.sbt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ TaskKey[Unit]("patchIfSbt2") := {
1414
IO.write(
1515
yml,
1616
IO.read(yml).replace(
17-
"run: tar cf targets.tar target project/target",
18-
s"run: tar cf targets.tar ${targetPath} project/target"
17+
"run: tar chf targets.tar target project/target",
18+
s"run: tar chf targets.tar ${targetPath} project/target"
1919
)
2020
)
2121
}

0 commit comments

Comments
 (0)