Skip to content

Commit

Permalink
Merge branch 'master' into pool3
Browse files Browse the repository at this point in the history
  • Loading branch information
Andy C committed Jul 20, 2024
2 parents 900b26a + e80f630 commit e935d28
Show file tree
Hide file tree
Showing 584 changed files with 64,237 additions and 10,249 deletions.
2 changes: 1 addition & 1 deletion .builds/worker1.yml → .builds/worker1.yml_disabled
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ packages:
- fuse-overlayfs

secrets:
- 2678474d-b22b-449f-a19a-16cb403c94cd
- 839206d4-55e5-4840-8b1f-867dc3ac622e

tasks:
- mount-perms: |
Expand Down
25 changes: 11 additions & 14 deletions .builds/worker2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,24 +13,24 @@ packages:
- fuse-overlayfs

secrets:
- 2678474d-b22b-449f-a19a-16cb403c94cd
- 839206d4-55e5-4840-8b1f-867dc3ac622e

tasks:
- mount-perms: |
cd oil
soil/host-shim.sh mount-perms $PWD
#- cpp-tarball: |
#cd oil
#soil/host-shim.sh run-job-uke podman $PWD cpp-tarball
- cpp-tarball: |
cd oil
soil/host-shim.sh run-job-uke podman $PWD cpp-tarball
#- publish-cpp-tarball: |
#cd oil
#soil/sourcehut.sh publish-html-assuming-ssh-key cpp-tarball
- publish-cpp-tarball: |
cd oil
soil/sourcehut.sh publish-html-assuming-ssh-key cpp-tarball
#- job-reset-1: |
#cd oil
#soil/host-shim.sh job-reset
- job-reset-1: |
cd oil
soil/host-shim.sh job-reset
- benchmarks: |
cd oil
Expand Down Expand Up @@ -58,7 +58,4 @@ tasks:
- did-all-succeed: |
cd oil
#soil/host-shim.sh did-all-succeed cpp-tarball other-tests
#soil/host-shim.sh did-all-succeed cpp-tarball cpp-spec
#soil/host-shim.sh did-all-succeed cpp-tarball benchmarks
soil/host-shim.sh did-all-succeed benchmarks
soil/host-shim.sh did-all-succeed cpp-tarball benchmarks
2 changes: 1 addition & 1 deletion .builds/worker3.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ packages:
- fuse-overlayfs

secrets:
- 2678474d-b22b-449f-a19a-16cb403c94cd
- 839206d4-55e5-4840-8b1f-867dc3ac622e

tasks:
- dev-setup-debian: |
Expand Down
2 changes: 1 addition & 1 deletion .builds/worker5.yml_disabled → .builds/worker5.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ packages:
- vim

secrets:
- 2678474d-b22b-449f-a19a-16cb403c94cd
- 839206d4-55e5-4840-8b1f-867dc3ac622e

tasks:
- dev-setup-fedora: |
Expand Down
2 changes: 1 addition & 1 deletion .builds/worker6.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ packages:
# - time # causes an error, don't need it

secrets:
- 2678474d-b22b-449f-a19a-16cb403c94cd
- 839206d4-55e5-4840-8b1f-867dc3ac622e

tasks:
- dev-setup-alpine: |
Expand Down
Loading

0 comments on commit e935d28

Please sign in to comment.