diff --git a/Project.toml b/Project.toml index 1e7c368..bfdf037 100644 --- a/Project.toml +++ b/Project.toml @@ -1,6 +1,6 @@ name = "PSRContinuousDeployment" uuid = "f0087d4c-ff99-426e-93c9-09c1a88911f9" -version = "0.8.0" +version = "0.8.1" [deps] AWS = "fbe9abb3-538b-5e4e-ba9e-bc94f4f92ebc" diff --git a/format/.gitignore b/format/.gitignore deleted file mode 100644 index 2251642..0000000 --- a/format/.gitignore +++ /dev/null @@ -1 +0,0 @@ -Manifest.toml \ No newline at end of file diff --git a/src/compile.jl b/src/compile.jl index 7cd36c1..8dfb2c9 100644 --- a/src/compile.jl +++ b/src/compile.jl @@ -50,31 +50,31 @@ function compile( Log.info("COMPILE: memory total $total_memory MB") end - PackageCompiler.create_app( - package_path, - build_path, - executables = executables, - precompile_execution_file = precompile_path, - incremental = false, - filter_stdlibs = filter_stdlibs, - force = true, - include_lazy_artifacts = include_lazy_artifacts, - include_transitive_dependencies = include_transitive_dependencies, - sysimage_build_args = `--strip-metadata --strip-ir --compile=all`, - kwargs..., - ) - if !skip_version_jl + PackageCompiler.create_app( + package_path, + build_path, + executables = executables, + precompile_execution_file = precompile_path, + incremental = false, + filter_stdlibs = filter_stdlibs, + force = true, + include_lazy_artifacts = include_lazy_artifacts, + include_transitive_dependencies = include_transitive_dependencies, + sysimage_build_args = `--strip-metadata --strip-ir --compile=all`, + kwargs..., + ) + if !skip_version_jl Log.info("COMPILE: Cleaning version.jl") clean_version_jl(src_path) - + Log.info("COMPILE: Creating $target.ver") open(joinpath(bin_path, "$target.ver"), "w") do io writeln(io, sha1) return nothing end end - + Log.info("COMPILE: Copying additional files") for file_path in additional_files_path copy(dirname(file_path), bin_path, basename(file_path)) @@ -97,10 +97,15 @@ function compile( open(joinpath(bin_path, "Project.toml"), "w") do io writeln(io, "name = \"$target\"") writeln(io, "version = \"$version\"") + return nothing end - Log.info("COMPILE: Removing julia.exe") - rm(joinpath(bin_path, "julia.exe"), force = true) + Log.info("COMPILE: Removing julia") + if Sys.iswindows() + rm(joinpath(bin_path, "julia.exe"), force = true) + elseif Sys.islinux() + rm(joinpath(bin_path, "julia"), force = true) + end Log.info("COMPILE: Success") touch(joinpath(compile_path, "build.ok")) diff --git a/test/Example.jl/src/main.jl b/test/Example.jl/src/main.jl index 50313eb..f15b99e 100644 --- a/test/Example.jl/src/main.jl +++ b/test/Example.jl/src/main.jl @@ -1,5 +1,4 @@ function main(args::Vector{String}) - println("Example.jl") return nothing diff --git a/test/Example.jl/test/runtests.jl b/test/Example.jl/test/runtests.jl deleted file mode 100644 index 644ec41..0000000 --- a/test/Example.jl/test/runtests.jl +++ /dev/null @@ -1 +0,0 @@ -using Test \ No newline at end of file diff --git a/test/runtests.jl b/test/runtests.jl index 4ccc44d..637c0ce 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -2,8 +2,6 @@ using PSRContinuousDeployment using Test -const ID = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" - function testall() package_path = joinpath(@__DIR__, "Example.jl") database_path = joinpath(package_path, "database") @@ -27,4 +25,4 @@ function testall() return 0 end -testall() \ No newline at end of file +testall()