Skip to content

Commit

Permalink
Merge pull request #243 from GraphBLAS/v1.1_branch
Browse files Browse the repository at this point in the history
V1.1 branch
  • Loading branch information
DrTimothyAldenDavis authored Dec 30, 2023
2 parents 7887f54 + 3f0cf78 commit c6dcf33
Show file tree
Hide file tree
Showing 77 changed files with 1,977 additions and 751 deletions.
7 changes: 6 additions & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
name: LAGraph CI

on: [push, pull_request]
on:
workflow_dispatch:
push:
branches-ignore:
- '**/*dev2'
pull_request:

jobs:
linux:
Expand Down
2 changes: 1 addition & 1 deletion Acknowledgments.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ THIS WORK IS FUNDED IN PART BY:
THIS WORK BUILDS UPON THE FOLLOWING PRIOR WORKS:
1. SuiteSparse:GraphBLAS,
(http://faculty.cse.tamu.edu/davis/GraphBLAS.html)
Copyright 2017-2022 Timothy A. Davis (Author), AldenMath.com.
Copyright 2017-2023 Timothy A. Davis (Author), AldenMath.com.
By Tim Davis, Texas A&M University. Note that while SuiteSparse:GraphBLAS
is itself under the Apache 2 license, any contributions derived from
SuiteSparse:GraphBLAS and incorporated by the Author into LAGraph are
Expand Down
Loading

0 comments on commit c6dcf33

Please sign in to comment.