Skip to content

Commit 24d77ba

Browse files
authored
Merge branch 'master' into wojciech/hashmap_deceq
2 parents e1b4565 + 1824865 commit 24d77ba

File tree

1,644 files changed

+612720
-549117
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,644 files changed

+612720
-549117
lines changed

.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ RELEASES.md merge=union
44
stage0/** binary linguist-generated
55
# The following file is often manually edited, so do show it in diffs
66
stage0/src/stdlib_flags.h -binary -linguist-generated
7+
doc/std/grove/GroveStdlib/Generated/** linguist-generated
78
# These files should not have line endings translated on Windows, because
89
# it throws off parser tests. Later lines override earlier ones, so the
910
# runner code is still treated as ordinary text.

.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ assignees: ''
99

1010
### Prerequisites
1111

12-
Please put an X between the brackets as you perform the following steps:
12+
<!-- Please put an X between the brackets as you perform the following steps: -->
1313

1414
* [ ] Check that your issue is not already filed:
1515
https://github.com/leanprover/lean4/issues

.github/workflows/grove.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ jobs:
5151
- name: Fetch upstream invalidated facts
5252
if: ${{ steps.should-run.outputs.should-run == 'true' && steps.workflow-info.outputs.pullRequestNumber != '' }}
5353
id: fetch-upstream
54-
uses: TwoFx/grove-action/fetch-upstream@v0.4
54+
uses: TwoFx/grove-action/fetch-upstream@v0.5
5555
with:
5656
artifact-name: grove-invalidated-facts
5757
base-ref: master
@@ -65,6 +65,7 @@ jobs:
6565
workflow: ci.yml
6666
path: artifacts
6767
name: "build-Linux release"
68+
allow_forks: true
6869
name_is_regexp: true
6970

7071
- name: Unpack toolchain
@@ -95,7 +96,7 @@ jobs:
9596
- name: Build
9697
if: ${{ steps.should-run.outputs.should-run == 'true' }}
9798
id: build
98-
uses: TwoFx/grove-action/build@v0.4
99+
uses: TwoFx/grove-action/build@v0.5
99100
with:
100101
project-path: doc/std/grove
101102
script-name: grove-stdlib

.github/workflows/pr-release.yml

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ jobs:
127127
description: "${{ github.repository_owner }}/lean4-pr-releases:pr-release-${{ steps.workflow-info.outputs.pullRequestNumber }}-${{ env.SHORT_SHA }}",
128128
});
129129
130-
- name: Add label
130+
- name: Add toolchain-available label
131131
if: ${{ steps.workflow-info.outputs.pullRequestNumber != '' }}
132132
uses: actions/github-script@v8
133133
with:
@@ -515,6 +515,18 @@ jobs:
515515
run: |
516516
git push origin lean-pr-testing-${{ steps.workflow-info.outputs.pullRequestNumber }}
517517
518+
- name: Add mathlib4-nightly-available label
519+
if: steps.workflow-info.outputs.pullRequestNumber != '' && steps.ready.outputs.mathlib_ready == 'true'
520+
uses: actions/github-script@v8
521+
with:
522+
script: |
523+
await github.rest.issues.addLabels({
524+
issue_number: ${{ steps.workflow-info.outputs.pullRequestNumber }},
525+
owner: context.repo.owner,
526+
repo: context.repo.repo,
527+
labels: ['mathlib4-nightly-available']
528+
})
529+
518530
# We next automatically create a reference manual branch using this toolchain.
519531
# Reference manual CI will be responsible for reporting back success or failure
520532
# to the PR comments asynchronously (and thus transitively SubVerso/Verso).

CMakeLists.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,9 @@ if (NOT ${CMAKE_SYSTEM_NAME} MATCHES "Emscripten")
4444
set(CADICAL_CXX c++)
4545
if (CADICAL_USE_CUSTOM_CXX)
4646
set(CADICAL_CXX ${CMAKE_CXX_COMPILER})
47-
set(CADICAL_CXXFLAGS "${LEAN_EXTRA_CXX_FLAGS}")
47+
# Use same platform flags as for Lean executables, in particular from `prepare-llvm-linux.sh`,
48+
# but not Lean-specific `LEAN_EXTRA_CXX_FLAGS` such as fsanitize.
49+
set(CADICAL_CXXFLAGS "${CMAKE_CXX_FLAGS}")
4850
set(CADICAL_LDFLAGS "-Wl,-rpath=\\$$ORIGIN/../lib")
4951
endif()
5052
find_program(CCACHE ccache)

doc/std/grove/GroveStdlib/Generated.lean

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import GroveStdlib.Generated.«associative-creation-operations»
44
import GroveStdlib.Generated.«associative-modification-operations»
55
import GroveStdlib.Generated.«associative-create-then-query»
66
import GroveStdlib.Generated.«associative-all-operations-covered»
7+
import GroveStdlib.Generated.«slice-producing»
78

89
/-
910
This file is autogenerated by grove. You can manually edit it, for example to resolve merge
@@ -20,3 +21,4 @@ def restoreState : RestoreStateM Unit := do
2021
«associative-modification-operations».restoreState
2122
«associative-create-then-query».restoreState
2223
«associative-all-operations-covered».restoreState
24+
«slice-producing».restoreState

0 commit comments

Comments
 (0)