Skip to content

Commit 5709c27

Browse files
authored
Merge branch 'master' into gb/macos-is-odd
2 parents a9442a9 + 791bc90 commit 5709c27

File tree

5 files changed

+10
-5
lines changed

5 files changed

+10
-5
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: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,11 @@ jobs:
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"

src/PackageCompiler.jl

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -740,7 +740,9 @@ end
740740
# App #
741741
#######
742742

743-
const IS_OFFICIAL = Base.TAGGED_RELEASE_BANNER == "Official https://julialang.org/ release"
743+
# Previously there was a slash.
744+
# The slash was removed in https://github.com/JuliaLang/julia/pull/53978
745+
const IS_OFFICIAL = Base.TAGGED_RELEASE_BANNER in ("Official https://julialang.org/ release", "Official https://julialang.org release")
744746
function warn_official()
745747
if !IS_OFFICIAL
746748
@warn "PackageCompiler: This does not look like an official Julia build, functionality may suffer." _module=nothing _file=nothing

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=gnu99")
5859
include = shell_escape(julia_includedir())
5960
print(flags, " -I", include)
6061
if Sys.isunix()

0 commit comments

Comments
 (0)