Skip to content

Commit d08406d

Browse files
committed
Merge tag '1.13.0' into ubuntu-ppa
2 parents e109cd1 + d3c23e4 commit d08406d

42 files changed

Lines changed: 1970 additions & 881 deletions

Some content is hidden

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

.clang-format

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,4 @@ IndentWidth: 4
33
BinPackArguments: false
44
BinPackParameters: false
55
IndentCaseLabels: true
6+
IndentPPDirectives: BeforeHash

.github/dependabot.yml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
version: 2
22
updates:
3-
- package-ecosystem: "github-actions"
4-
directory: "/"
5-
schedule:
6-
interval: daily
3+
- package-ecosystem: github-actions
4+
directory: /
5+
schedule:
6+
interval: daily
7+
time: '14:00'
8+
cooldown:
9+
default-days: 7

.github/workflows/clang-addresssanitizer.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ on:
44
pull_request:
55
schedule:
66
- cron: '13 20 * * SUN'
7+
permissions: {}
78
jobs:
89
addresssanitizer:
910
name: Clang AddressSanitizer
@@ -16,7 +17,7 @@ jobs:
1617
CXXFLAGS: -fsanitize=address
1718
LDFLAGS: -fsanitize=address
1819
steps:
19-
- uses: actions/checkout@v4
20+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
2021
with:
2122
submodules: true
2223
persist-credentials: false

.github/workflows/clang-analyzer.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,13 @@ on:
44
pull_request:
55
schedule:
66
- cron: '3 20 * * SUN'
7+
permissions: {}
78
jobs:
89
clang-analyzer:
910
name: Clang static analysis
1011
runs-on: ubuntu-latest
1112
steps:
12-
- uses: actions/checkout@v4
13+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
1314
with:
1415
persist-credentials: false
1516
- run: sudo apt install clang-tools libipc-run3-perl

.github/workflows/codeql-analysis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818

1919
steps:
2020
- name: Checkout repository
21-
uses: actions/checkout@v4
21+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
2222
with:
2323
# We must fetch at least the immediate parents so that if this is
2424
# a pull request then we can checkout the head.
@@ -33,7 +33,7 @@ jobs:
3333

3434
# Initializes the CodeQL tools for scanning.
3535
- name: Initialize CodeQL
36-
uses: github/codeql-action/init@v3
36+
uses: github/codeql-action/init@9e907b5e64f6b83e7804b09294d44122997950d6 # v4.32.3
3737

3838
- run: sudo apt install libipc-run3-perl pandoc
3939
- run: |
@@ -43,4 +43,4 @@ jobs:
4343
make safedist
4444
4545
- name: Perform CodeQL Analysis
46-
uses: github/codeql-action/analyze@v3
46+
uses: github/codeql-action/analyze@9e907b5e64f6b83e7804b09294d44122997950d6 # v4.32.3

.github/workflows/precious.yml

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
name: precious
2+
3+
on:
4+
push:
5+
pull_request:
6+
7+
permissions: {}
8+
9+
jobs:
10+
precious:
11+
name: lint
12+
runs-on: ubuntu-latest
13+
steps:
14+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
15+
with:
16+
persist-credentials: false
17+
18+
- name: Setup mise
19+
uses: jdx/mise-action@6d1e696aa24c1aa1bcc1adea0212707c71ab78a8 # v3.6.1
20+
with:
21+
cache: true
22+
23+
- name: Run precious lint
24+
run: precious lint --all

.github/workflows/test.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ on:
44
pull_request:
55
schedule:
66
- cron: '3 20 * * SUN'
7+
permissions: {}
78
jobs:
89
test-autoconf:
910
strategy:
@@ -17,7 +18,7 @@ jobs:
1718
CC: ${{ matrix.cc }}
1819
VERBOSE: 1
1920
steps:
20-
- uses: actions/checkout@v4
21+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
2122
with:
2223
submodules: true
2324
persist-credentials: false
@@ -39,7 +40,7 @@ jobs:
3940
name: CMake build on ${{matrix.os}}
4041
runs-on: ${{ matrix.os }}
4142
steps:
42-
- uses: actions/checkout@v4
43+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
4344
with:
4445
submodules: true
4546
persist-credentials: false

.github/workflows/zizmor.yml

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,27 +6,18 @@ on:
66
pull_request:
77
branches: ["**"]
88

9+
permissions: {}
10+
911
jobs:
1012
zizmor:
11-
name: zizmor latest via PyPI
1213
runs-on: ubuntu-latest
1314
permissions:
1415
security-events: write
15-
# required for workflows in private repositories
16-
contents: read
17-
actions: read
1816
steps:
1917
- name: Checkout repository
20-
uses: actions/checkout@v4
18+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
2119
with:
2220
persist-credentials: false
2321

24-
- name: Install the latest version of uv
25-
uses: astral-sh/setup-uv@v5
26-
with:
27-
enable-cache: false
28-
2922
- name: Run zizmor
30-
run: uvx zizmor --format plain .
31-
env:
32-
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
23+
uses: zizmorcore/zizmor-action@0dce2577a4760a2749d8cfb7a84b7d5585ebcb7d # v0.5.0

.precious.toml

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
exclude = [
2+
".git",
3+
"maxmind-db/**",
4+
"t/libtap/**",
5+
"t/maxmind-db/**",
6+
]
7+
8+
[commands.clang-format]
9+
type = "both"
10+
cmd = ["clang-format", "-style=file"]
11+
lint-flags = ["--dry-run", "-Werror"]
12+
tidy-flags = ["-i"]
13+
path-args = "file"
14+
include = ["**/*.c", "**/*.h"]
15+
ok-exit-codes = 0
16+
17+
[commands.prettier-markdown]
18+
type = "both"
19+
cmd = ["prettier", "--prose-wrap", "always", "--print-width", "80"]
20+
lint-flags = ["--check"]
21+
tidy-flags = ["--write"]
22+
path-args = "file"
23+
include = ["**/*.md"]
24+
ok-exit-codes = 0

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ cmake_minimum_required (VERSION 3.9...3.30)
22

33
project(maxminddb
44
LANGUAGES C
5-
VERSION 1.12.2
5+
VERSION 1.13.0
66
)
77
set(MAXMINDDB_SOVERSION 0.0.7)
88
set(CMAKE_C_STANDARD 99)

0 commit comments

Comments
 (0)