use a common test file

julia-actions · Jan 5, 2024 · dcc55a3 · dcc55a3
1 parent c8bcd33
commit dcc55a3
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 52 deletions.
diff --git a/.github/workflows/common-tests.jl b/.github/workflows/common-tests.jl
@@ -0,0 +1,11 @@
+if !occursin("hostedtoolcache", Sys.BINDIR)
+    error("the wrong julia is being used: $(Sys.BINDIR)")
+end
+if VERSION >= v"1.7.0" # pkgdir was introduced here, and before then mtime wasn't a problem so just skip
+    using Pkg
+    src = pkgdir(Pkg, "src", "Pkg.jl")
+    # mtime is when it's compressed, ctime is when the file is extracted
+    if !<(mtime(src), ctime(src))
+        error("source mtime ($(mtime(src))) is not earlier than ctime ($(ctime(src)))")
+    end
+end
diff --git a/.github/workflows/example-builds-defaultarch.yml b/.github/workflows/example-builds-defaultarch.yml
@@ -45,16 +45,4 @@ jobs:
       - run: julia --version
       - run: julia --compile=min -O0 -e 'import InteractiveUtils; InteractiveUtils.versioninfo()'
       - name: "Check that the correct julia is used and that archive mtimes are maintained"
-        run: |
-          if !occursin("hostedtoolcache", Sys.BINDIR)
-            error("the wrong julia is being used: $(Sys.BINDIR)")
-          end
-          if VERSION > v"1.7.0-0" # pkgdir was introduced here, and before then mtime wasn't a problem so just skip
-            using Pkg
-            src = pkgdir(Pkg, "src", "Pkg.jl")
-            # mtime is when it's compressed, ctime is when the file is extracted
-            if !<(mtime(src), ctime(src))
-              error("source mtime ($(mtime(src))) is not earlier than ctime ($(ctime(src)))")
-            end
-          end
-        shell: julia --startup-file=no --color=yes {0}
+        run: julia --startup-file=no --color=yes ./.github/workflows/common-tests.jl
diff --git a/.github/workflows/example-builds-nightly-defaultarch.yml b/.github/workflows/example-builds-nightly-defaultarch.yml
@@ -43,16 +43,4 @@ jobs:
       - run: julia --version
       - run: julia --compile=min -O0 -e 'import InteractiveUtils; InteractiveUtils.versioninfo()'
       - name: "Check that the correct julia is used and that archive mtimes are maintained"
-        run: |
-          if !occursin("hostedtoolcache", Sys.BINDIR)
-            error("the wrong julia is being used: $(Sys.BINDIR)")
-          end
-          if VERSION > v"1.7.0-0" # pkgdir was introduced here, and before then mtime wasn't a problem so just skip
-            using Pkg
-            src = pkgdir(Pkg, "src", "Pkg.jl")
-            # mtime is when it's compressed, ctime is when the file is extracted
-            if !<(mtime(src), ctime(src))
-              error("source mtime ($(mtime(src))) is not earlier than ctime ($(ctime(src)))")
-            end
-          end
-        shell: julia --startup-file=no --color=yes {0}
+        run: julia --startup-file=no --color=yes ./.github/workflows/common-tests.jl
diff --git a/.github/workflows/example-builds-nightly.yml b/.github/workflows/example-builds-nightly.yml
@@ -51,16 +51,4 @@ jobs:
       - run: julia --version
       - run: julia --compile=min -O0 -e 'import InteractiveUtils; InteractiveUtils.versioninfo()'
       - name: "Check that the correct julia is used and that archive mtimes are maintained"
-        run: |
-          if !occursin("hostedtoolcache", Sys.BINDIR)
-            error("the wrong julia is being used: $(Sys.BINDIR)")
-          end
-          if VERSION > v"1.7.0-0" # pkgdir was introduced here, and before then mtime wasn't a problem so just skip
-            using Pkg
-            src = pkgdir(Pkg, "src", "Pkg.jl")
-            # mtime is when it's compressed, ctime is when the file is extracted
-            if !<(mtime(src), ctime(src))
-              error("source mtime ($(mtime(src))) is not earlier than ctime ($(ctime(src)))")
-            end
-          end
-        shell: julia --startup-file=no --color=yes {0}
+        run: julia --startup-file=no --color=yes ./.github/workflows/common-tests.jl
diff --git a/.github/workflows/example-builds.yml b/.github/workflows/example-builds.yml
@@ -51,16 +51,4 @@ jobs:
       - run: julia --version
       - run: julia --compile=min -O0 -e 'import InteractiveUtils; InteractiveUtils.versioninfo()'
       - name: "Check that the correct julia is used and that archive mtimes are maintained"
-        run: |
-          if !occursin("hostedtoolcache", Sys.BINDIR)
-            error("the wrong julia is being used: $(Sys.BINDIR)")
-          end
-          if VERSION > v"1.7.0-0" # pkgdir was introduced here, and before then mtime wasn't a problem so just skip
-            using Pkg
-            src = pkgdir(Pkg, "src", "Pkg.jl")
-            # mtime is when it's compressed, ctime is when the file is extracted
-            if !<(mtime(src), ctime(src))
-              error("source mtime ($(mtime(src))) is not earlier than ctime ($(ctime(src)))")
-            end
-          end
-        shell: julia --startup-file=no --color=yes {0}
+        run: julia --startup-file=no --color=yes ./.github/workflows/common-tests.jl