Skip to content

Commit 6c5b8c0

Browse files
NemricNemric
authored
Merge branch 'coreos:main' into user-units
2 parents 07d1f1a + 53fad9f commit 6c5b8c0

File tree

26 files changed

+163
-164
lines changed

26 files changed

+163
-164
lines changed

‎.github/workflows/container.yml‎

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,32 @@ name: Container
33
on:
44
push:
55
branches: [main]
6+
tags: ["v*"]
67
pull_request:
78
branches: [main]
89

910
permissions:
1011
contents: read
1112

13+
# avoid races when pushing containers built from main
14+
concurrency:
15+
group: ${{ github.workflow }}-${{ github.ref }}
16+
1217
jobs:
1318
build-container:
1419
name: Build container image
1520
runs-on: ubuntu-latest
1621
steps:
1722
- name: Check out repository
1823
uses: actions/checkout@v2
19-
- name: Build container image
20-
run: podman build -f Dockerfile.validate .
24+
with:
25+
# fetch tags so the compiled-in version number is useful
26+
fetch-depth: 0
27+
- name: Build and push container
28+
uses: coreos/actions-lib/build-container@main
29+
with:
30+
credentials: ${{ secrets.QUAY_AUTH }}
31+
file: Dockerfile.validate
32+
push: quay.io/coreos/ignition-validate
33+
# Speed up PR CI by skipping arm64
34+
pr-arches: amd64

‎.github/workflows/go.yml‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
name: test build
1515
strategy:
1616
matrix:
17-
go-version: [1.15.x, 1.16.x, 1.17.x]
17+
go-version: [1.15.x, 1.16.x, 1.17.x, 1.18.x]
1818
runs-on: ubuntu-latest
1919
steps:
2020
- name: Set up Go 1.x
@@ -24,19 +24,21 @@ jobs:
2424
- name: Checkout Repository
2525
uses: actions/checkout@v2
2626
- name: Install libblkid-dev
27-
run: sudo apt-get install libblkid-dev
27+
run: |
28+
sudo apt-get update
29+
sudo apt-get install libblkid-dev
2830
- name: Run tests
2931
run: ./test
3032
- name: Run linter
3133
uses: golangci/golangci-lint-action@v2
3234
with:
33-
version: v1.42.0
35+
version: v1.45.0
3436
args: -E=gofmt --timeout=30m0s
3537
test-validate:
3638
name: test ignition-validate
3739
strategy:
3840
matrix:
39-
go-version: [1.17.x]
41+
go-version: [1.18.x]
4042
os: [macos-latest, windows-latest]
4143
runs-on: ${{ matrix.os }}
4244
steps:

‎Dockerfile.validate‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
FROM registry.fedoraproject.org/fedora:35 AS builder
2-
RUN dnf install -y golang git
2+
RUN dnf install -y golang git-core
33
RUN mkdir /ignition-validate
44
COPY . /ignition-validate
55
WORKDIR /ignition-validate

‎build_for_container‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,5 @@ export GO11MODULE=on
2727
export CGO_ENABLED=0
2828
export GOFLAGS='-mod=vendor'
2929
export GOOS=linux
30-
export GOARCH=amd64
3130

3231
go build -ldflags "${GLDFLAGS}" -o ${BIN_PATH}/ignition-validate ${REPO_PATH}/validate

‎config/v3_1/types/headers_test.go‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
package types
1616

1717
import (
18-
"strings"
1918
"testing"
2019

2120
"github.com/coreos/ignition/v2/config/shared/errors"
@@ -133,7 +132,7 @@ func TestValidHeadersParse(t *testing.T) {
133132
if err != nil {
134133
t.Errorf("error during parsing valid headers: %v", err)
135134
}
136-
if !equal(parseHeaders[strings.Title("header1")], []string{"header1value"}) || !equal(parseHeaders[strings.Title("header2")], []string{"header2value"}) {
135+
if !equal(parseHeaders["Header1"], []string{"header1value"}) || !equal(parseHeaders["Header2"], []string{"header2value"}) {
137136
t.Errorf("parsed HTTP headers values are wrong")
138137
}
139138
}
@@ -154,7 +153,7 @@ func TestDuplicateHeadersParse(t *testing.T) {
154153
if err != nil {
155154
t.Errorf("error during parsing valid headers: %v", err)
156155
}
157-
if !equal(parseHeaders[strings.Title("header1")], []string{"header1value", "header2value"}) {
156+
if !equal(parseHeaders["Header1"], []string{"header1value", "header2value"}) {
158157
t.Errorf("parsed HTTP headers values are wrong")
159158
}
160159
}

‎config/v3_2/types/headers_test.go‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
package types
1616

1717
import (
18-
"strings"
1918
"testing"
2019

2120
"github.com/coreos/ignition/v2/config/shared/errors"
@@ -133,7 +132,7 @@ func TestValidHeadersParse(t *testing.T) {
133132
if err != nil {
134133
t.Errorf("error during parsing valid headers: %v", err)
135134
}
136-
if !equal(parseHeaders[strings.Title("header1")], []string{"header1value"}) || !equal(parseHeaders[strings.Title("header2")], []string{"header2value"}) {
135+
if !equal(parseHeaders["Header1"], []string{"header1value"}) || !equal(parseHeaders["Header2"], []string{"header2value"}) {
137136
t.Errorf("parsed HTTP headers values are wrong")
138137
}
139138
}
@@ -154,7 +153,7 @@ func TestDuplicateHeadersParse(t *testing.T) {
154153
if err != nil {
155154
t.Errorf("error during parsing valid headers: %v", err)
156155
}
157-
if !equal(parseHeaders[strings.Title("header1")], []string{"header1value", "header2value"}) {
156+
if !equal(parseHeaders["Header1"], []string{"header1value", "header2value"}) {
158157
t.Errorf("parsed HTTP headers values are wrong")
159158
}
160159
}

‎config/v3_3/types/headers_test.go‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
package types
1616

1717
import (
18-
"strings"
1918
"testing"
2019

2120
"github.com/coreos/ignition/v2/config/shared/errors"
@@ -133,7 +132,7 @@ func TestValidHeadersParse(t *testing.T) {
133132
if err != nil {
134133
t.Errorf("error during parsing valid headers: %v", err)
135134
}
136-
if !equal(parseHeaders[strings.Title("header1")], []string{"header1value"}) || !equal(parseHeaders[strings.Title("header2")], []string{"header2value"}) {
135+
if !equal(parseHeaders["Header1"], []string{"header1value"}) || !equal(parseHeaders["Header2"], []string{"header2value"}) {
137136
t.Errorf("parsed HTTP headers values are wrong")
138137
}
139138
}
@@ -154,7 +153,7 @@ func TestDuplicateHeadersParse(t *testing.T) {
154153
if err != nil {
155154
t.Errorf("error during parsing valid headers: %v", err)
156155
}
157-
if !equal(parseHeaders[strings.Title("header1")], []string{"header1value", "header2value"}) {
156+
if !equal(parseHeaders["Header1"], []string{"header1value", "header2value"}) {
158157
t.Errorf("parsed HTTP headers values are wrong")
159158
}
160159
}

‎config/v3_4_experimental/types/headers_test.go‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
package types
1616

1717
import (
18-
"strings"
1918
"testing"
2019

2120
"github.com/coreos/ignition/v2/config/shared/errors"
@@ -133,7 +132,7 @@ func TestValidHeadersParse(t *testing.T) {
133132
if err != nil {
134133
t.Errorf("error during parsing valid headers: %v", err)
135134
}
136-
if !equal(parseHeaders[strings.Title("header1")], []string{"header1value"}) || !equal(parseHeaders[strings.Title("header2")], []string{"header2value"}) {
135+
if !equal(parseHeaders["Header1"], []string{"header1value"}) || !equal(parseHeaders["Header2"], []string{"header2value"}) {
137136
t.Errorf("parsed HTTP headers values are wrong")
138137
}
139138
}
@@ -154,7 +153,7 @@ func TestDuplicateHeadersParse(t *testing.T) {
154153
if err != nil {
155154
t.Errorf("error during parsing valid headers: %v", err)
156155
}
157-
if !equal(parseHeaders[strings.Title("header1")], []string{"header1value", "header2value"}) {
156+
if !equal(parseHeaders["Header1"], []string{"header1value", "header2value"}) {
158157
t.Errorf("parsed HTTP headers values are wrong")
159158
}
160159
}

‎dracut/30ignition/ignition-disks.service‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[Unit]
22
Description=Ignition (disks)
3-
Documentation=https://github.com/coreos/ignition
3+
Documentation=https://coreos.github.io/ignition/
44
ConditionPathExists=/etc/initrd-release
55
DefaultDependencies=false
66
Before=ignition-complete.target

‎dracut/30ignition/ignition-fetch-offline.service‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
[Unit]
77
Description=Ignition (fetch-offline)
8-
Documentation=https://github.com/coreos/ignition
8+
Documentation=https://coreos.github.io/ignition/
99
ConditionPathExists=/etc/initrd-release
1010
DefaultDependencies=false
1111
Before=ignition-complete.target

0 commit comments

Comments
 (0)