Skip to content

Commit f93d77d

Browse files
shiftshift
authored
Merge pull request #135 from psychomantys/fix/build
Fix build
2 parents 1e3bb9e + c00b085 commit f93d77d

File tree

8 files changed

+116
-11
lines changed

8 files changed

+116
-11
lines changed

‎.github/workflows/mixin.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Generate Mixin Artifacts
22
on:
33
pull_request:
44
push:
5-
5+
66
jobs:
77
format:
88
runs-on: ubuntu-latest
@@ -11,7 +11,7 @@ jobs:
1111
- uses: kobtea/setup-jsonnet-action@v1
1212
- run: |
1313
cd mixin
14-
jb install
14+
jb install || true
1515
jsonnet -S alerts.jsonnet
1616
rm -rf ../chart/dashboards
1717
mkdir -p ../chart/dashboards

‎.github/workflows/release-please.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
release-please:
88
runs-on: ubuntu-latest
99
steps:
10-
- uses: google-github-actions/release-please-action@v3
10+
- uses: googleapis/release-please-action@v4
1111
with:
1212
release-type: node
1313
package-name: release-please-action

‎.github/workflows/release.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,22 +32,22 @@ jobs:
3232
with:
3333
registry: ghcr.io
3434
username: ${{ github.actor }}
35-
password: ${{ secrets.GITHUB_TOKEN }}
35+
password: ${{ secrets.RELEASES_GITHUB_TOKEN }}
3636
- name: Install Cosign
3737
uses: sigstore/cosign-installer@main
38-
with:
39-
cosign-release: "v1.4.1"
38+
#with:
39+
# cosign-release: "v2.4.0"
4040
- name: Setup Cosign
4141
run: |
4242
echo "${COSIGN_KEY}" > "$GITHUB_WORKSPACE/cosign.key"
4343
env:
4444
COSIGN_KEY: ${{ secrets.COSIGN_KEY }}
4545
- name: Run GoReleaser
46-
uses: goreleaser/goreleaser-action@v4
46+
uses: goreleaser/goreleaser-action@v6
4747
with:
4848
distribution: goreleaser
4949
version: latest
50-
args: release --rm-dist
50+
args: release --clean
5151
env:
5252
GITHUB_TOKEN: ${{ secrets.RELEASES_GITHUB_TOKEN }}
5353
COSIGN_PASSWORD: ${{ secrets.COSIGN_PASSWORD }}

‎.goreleaser.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ signs:
107107
- cmd: cosign
108108
stdin: "{{ .Env.COSIGN_PASSWORD }}"
109109
args:
110-
["sign-blob", "--key=cosign.key", "--output=${signature}", "${artifact}"]
110+
["sign-blob", "--key=cosign.key", "--output=${signature}", "${artifact}","--tlog-upload=false"]
111111
artifacts: all
112112
docker_signs:
113113
- artifacts: all

‎main.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ var (
4545
[]string{"domain"},
4646
)
4747

48-
expiryRegex = regexp.MustCompile(`(?i)(\[有効期限]|Registry Expiry Date|paid-till|Expiration Date|Expiration Time|Expiry.*|expires.*|expire-date)[?:|\s][ \t](.*)`)
48+
expiryRegex = regexp.MustCompile(`(?i)(\[有効期限]|Registry Expiry Date|paid-till|Expiration Date|Expiration Time|Expiry.*|expires.*|expire-date|Expire Date)[?:|\s][ \t](.*)`)
4949

5050
formats = []string{
5151
"2006-01-02",
@@ -61,7 +61,7 @@ var (
6161
"2006-01-02 15:04:05",
6262
"2.1.2006 15:04:05",
6363
"02/01/2006 15:04:05",
64-
"20060102",
64+
"20060102",
6565
}
6666

6767
config promlog.Config

‎parse_test.go‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ func TestParsing(t *testing.T) {
2929
{filename: "google.cn", date: time.Date(2019, 3, 17, 12, 48, 36, 0, time.UTC)},
3030
{filename: "google.jp", date: time.Date(2021, 5, 31, 0, 0, 0, 0, time.UTC)},
3131
{filename: "google.com", date: time.Date(2020, 9, 14, 4, 0, 0, 0, time.UTC)},
32+
{filename: "google.it", date: time.Date(2026, 4, 21, 0, 0, 0, 0, time.UTC)},
33+
{filename: "google.com.br", date: time.Date(2026, 5, 18, 0, 0, 0, 0, time.UTC)},
3234
{filename: "ietf.org", date: time.Date(2020, 3, 12, 5, 0, 0, 0, time.UTC)},
3335
{filename: "unisportstore.fi", date: time.Date(2019, 3, 20, 17, 13, 49, 0, time.UTC)},
3436
{filename: "yolo.im", date: time.Date(2022, 06, 05, 00, 59, 59, 0, time.UTC)},

‎testdata/google.com.br‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
% Copyright (c) Nic.br - Use of this data is governed by the Use and
2+
% Privacy Policy at https://registro.br/upp . Distribution,
3+
% commercialization, reproduction, and use for advertising or similar
4+
% purposes are expressly prohibited.
5+
% 2025-07-27T21:18:24-03:00 - 2804:29b8:513a:b2a:aa41:f4ff:fee9:9d37
6+
7+
domain: google.com.br
8+
owner: Google Brasil Internet Ltda
9+
ownerid: 06.990.590/0001-23
10+
responsible: Domain Administrator
11+
country: BR
12+
owner-c: DOADM17
13+
tech-c: DOADM17
14+
nserver: ns1.google.com
15+
nsstat: 20250726 AA
16+
nslastaa: 20250726
17+
nserver: ns2.google.com
18+
nsstat: 20250726 AA
19+
nslastaa: 20250726
20+
nserver: ns3.google.com
21+
nsstat: 20250726 AA
22+
nslastaa: 20250726
23+
nserver: ns4.google.com
24+
nsstat: 20250726 AA
25+
nslastaa: 20250726
26+
created: 19990518 #162310
27+
changed: 20250416
28+
expires: 20260518
29+
status: published
30+
31+
nic-hdl-br: DOADM17
32+
person: Domain Admin
33+
e-mail: ccops@markmonitor.com
34+
country: BR
35+
created: 20100520
36+
changed: 20220228
37+
38+
% Security and mail abuse issues should also be addressed to cert.br,
39+
% respectivelly to cert@cert.br and mail-abuse@cert.br
40+
%
41+
% whois.registro.br only accepts exact match queries for domains,
42+
% registrants, contacts, tickets, providers, IPs, and ASNs.

‎testdata/google.it‎

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
2+
*********************************************************************
3+
* Please note that the following result could be a subgroup of *
4+
* the data contained in the database. *
5+
* *
6+
* Additional information can be visualized at: *
7+
* http://web-whois.nic.it *
8+
*********************************************************************
9+
10+
Domain: google.it
11+
Status: ok
12+
Signed: no
13+
Created: 1999-12-10 00:00:00
14+
Last Update: 2025-05-07 00:52:22
15+
Expire Date: 2026-04-21
16+
17+
Registrant
18+
Organization: Google Ireland Holdings Unlimited Company
19+
Address: 70 Sir John Rogerson's Quay
20+
Dublin
21+
2
22+
Dublin
23+
IE
24+
Created: 2018-03-02 19:04:02
25+
Last Update: 2018-03-02 19:04:02
26+
27+
Admin Contact
28+
Name: Colm Buckley
29+
Organization: Google LLC
30+
Address: 1600 Amphitheatre Parkway
31+
Mountain View
32+
94043
33+
CA
34+
US
35+
Created: 2024-09-27 00:44:25
36+
Last Update: 2024-09-27 00:44:25
37+
38+
Technical Contacts
39+
Name: Domain Administrator
40+
Organization: Google LLC
41+
Address: 1600 Amphitheatre Parkway
42+
Mountain View
43+
94043
44+
CA
45+
US
46+
Created: 2017-12-21 19:54:04
47+
Last Update: 2017-12-21 19:54:04
48+
49+
Registrar
50+
Organization: MarkMonitor International Limited
51+
Name: MARKMONITOR-REG
52+
Web: https://www.markmonitor.com/
53+
DNSSEC: no
54+
55+
56+
Nameservers
57+
ns1.google.com
58+
ns2.google.com
59+
ns3.google.com
60+
ns4.google.com
61+

0 commit comments

Comments
 (0)