Skip to content

Commit 3d8f36b

Browse files
authored
Merge branch 'master' into xcode-flag-fix
2 parents 7161e1a + ded0163 commit 3d8f36b

File tree

6 files changed

+10
-17
lines changed

6 files changed

+10
-17
lines changed

.github/workflows/MyLib.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
runs-on: ubuntu-latest
1515
steps:
1616
- uses: actions/checkout@v4
17-
- uses: julia-actions/setup-julia@v1
17+
- uses: julia-actions/setup-julia@v2
1818
with:
1919
version: '1'
2020
- uses: julia-actions/julia-buildpkg@v1

.github/workflows/ci.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,14 +54,16 @@ jobs:
5454
- uses: julia-actions/setup-julia@latest
5555
with:
5656
version: ${{ matrix.julia-version }}
57-
- uses: julia-actions/cache@v1
57+
- uses: julia-actions/cache@v2
5858
- uses: julia-actions/julia-runtest@latest
5959
with:
6060
coverage: ${{ matrix.coverage }}
6161
- uses: julia-actions/julia-processcoverage@latest
62-
- uses: codecov/codecov-action@v3
62+
- uses: codecov/codecov-action@v4
6363
with:
6464
file: lcov.info
65+
env:
66+
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
6567
docs:
6668
runs-on: ubuntu-latest
6769
timeout-minutes: 30

Project.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ p7zip_jll = "3f19e933-33d8-53b3-aaab-bd5110c3b7a0"
1818
Artifacts = "<0.0.1, 1"
1919
Glob = "1"
2020
LazyArtifacts = "<0.0.1, 1"
21-
Libdl = "1"
21+
Libdl = "<0.0.1, 1"
2222
Pkg = "<0.0.1, 1"
2323
Printf = "1"
2424
RelocatableFolders = "0.1, 0.3, 1"

docs/src/devdocs/sysimages_part_1.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,7 @@ should work to produce the sysimage shared library.
317317

318318
### 3. Running Julia with the new sysimage
319319

320-
We start Julia with the `-Jsys.so` flag to load the new custom `sys.so` sysimage (or `sys.dylib`, `sys.dll` on macOS and Windows respecitively)
320+
We start Julia with the `-Jsys.so` flag to load the new custom `sys.so` sysimage (or `sys.dylib`, `sys.dll` on macOS and Windows respectively)
321321
and indeed loading CSV is now very fast:
322322

323323
```julia-repl

src/PackageCompiler.jl

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -756,12 +756,6 @@ end
756756
# App #
757757
#######
758758

759-
const IS_OFFICIAL = Base.TAGGED_RELEASE_BANNER == "Official https://julialang.org/ release"
760-
function warn_official()
761-
if !IS_OFFICIAL
762-
@warn "PackageCompiler: This does not look like an official Julia build, functionality may suffer." _module=nothing _file=nothing
763-
end
764-
end
765759

766760
"""
767761
create_app(package_dir::String, compiled_app::String; kwargs...)
@@ -851,7 +845,6 @@ function create_app(package_dir::String,
851845
include_transitive_dependencies::Bool=true,
852846
include_preferences::Bool=true,
853847
script::Union{Nothing, String}=nothing)
854-
warn_official()
855848
if filter_stdlibs && incremental
856849
error("must use `incremental=false` to use `filter_stdlibs=true`")
857850
end
@@ -1059,9 +1052,6 @@ function create_library(package_or_project::String,
10591052
base_sysimage::Union{Nothing, String}=nothing
10601053
)
10611054

1062-
1063-
warn_official()
1064-
10651055
# Add init header files to list of bundled header files if not already present
10661056
if julia_init_h_file isa String
10671057
julia_init_h_file = [julia_init_h_file]
@@ -1235,7 +1225,7 @@ end
12351225

12361226
function bundle_julia_executable(dir::String)
12371227
bindir = joinpath(dir, "bin")
1238-
name = Sys.iswindows() ? "julia.exe" : "julia"
1228+
name = Base.julia_exename()
12391229
mkpath(bindir)
12401230
cp(joinpath(Sys.BINDIR::String, name), joinpath(bindir, name); force=true)
12411231
end

src/juliaconfig.jl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,8 @@ end
5454

5555
function cflags()
5656
flags = IOBuffer()
57-
print(flags, "-O2 -std=gnu99")
57+
print(flags, " -Werror-implicit-function-declaration")
58+
print(flags, " -O2 -std=gnu11")
5859
include = shell_escape(julia_includedir())
5960
print(flags, " -I", include)
6061
if Sys.isunix()

0 commit comments

Comments
 (0)