Skip to content

Commit 4edd353

Browse files
authored
Merge pull request #1020 from AkihiroSuda/dev
CI: update Go (1.19)
2 parents 78a7a3d + e6ba9ac commit 4edd353

File tree

5 files changed

+18
-16
lines changed

5 files changed

+18
-16
lines changed

.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
steps:
1818
- uses: actions/setup-go@v3
1919
with:
20-
go-version: 1.18.x
20+
go-version: 1.19.x
2121
- uses: actions/checkout@v3
2222
with:
2323
fetch-depth: 1
@@ -40,7 +40,7 @@ jobs:
4040
path: _artifacts/
4141
- uses: actions/setup-go@v3
4242
with:
43-
go-version: 1.18.x
43+
go-version: 1.19.x
4444
- name: Install gcc-aarch64-linux-gnu
4545
run: |
4646
sudo apt-get update

.github/workflows/test.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@ jobs:
1515
steps:
1616
- uses: actions/setup-go@v3
1717
with:
18-
go-version: 1.18.x
18+
go-version: 1.19.x
1919
- uses: actions/checkout@v3
2020
with:
2121
fetch-depth: 1
2222
- name: Run golangci-lint
2323
uses: golangci/golangci-lint-action@v3
2424
with:
25-
version: v1.45.2
25+
version: v1.48.0
2626
args: --verbose
2727
- name: Run yamllint
2828
run: yamllint .
@@ -58,7 +58,7 @@ jobs:
5858
steps:
5959
- uses: actions/setup-go@v3
6060
with:
61-
go-version: 1.18.x
61+
go-version: 1.19.x
6262
- uses: actions/checkout@v3
6363
with:
6464
fetch-depth: 1
@@ -79,7 +79,7 @@ jobs:
7979
steps:
8080
- uses: actions/setup-go@v3
8181
with:
82-
go-version: 1.18.x
82+
go-version: 1.19.x
8383
- uses: actions/checkout@v3
8484
with:
8585
fetch-depth: 1
@@ -165,7 +165,7 @@ jobs:
165165
steps:
166166
- uses: actions/setup-go@v3
167167
with:
168-
go-version: 1.18.x
168+
go-version: 1.19.x
169169
- uses: actions/checkout@v3
170170
with:
171171
fetch-depth: 0
@@ -191,7 +191,7 @@ jobs:
191191
steps:
192192
- uses: actions/setup-go@v3
193193
with:
194-
go-version: 1.18.x
194+
go-version: 1.19.x
195195
- uses: actions/checkout@v3
196196
with:
197197
fetch-depth: 1
@@ -205,7 +205,7 @@ jobs:
205205
steps:
206206
- uses: actions/setup-go@v3
207207
with:
208-
go-version: 1.18.x
208+
go-version: 1.19.x
209209
- name: Install gcc-aarch64-linux-gnu
210210
run: |
211211
sudo apt-get update

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/lima-vm/lima
22

3-
go 1.18
3+
go 1.19
44

55
require (
66
github.com/AlecAivazis/survey/v2 v2.3.5

pkg/guestagent/iptables/iptables.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,10 @@ type Entry struct {
2020
// This regex can detect a line in the iptables added by portmap to do the
2121
// forwarding. The following two are examples of lines (notice that one has the
2222
// destination IP and the other does not):
23-
// -A CNI-DN-2e2f8d5b91929ef9fc152 -d 127.0.0.1/32 -p tcp -m tcp --dport 8081 -j DNAT --to-destination 10.4.0.7:80
24-
// -A CNI-DN-04579c7bb67f4c3f6cca0 -p tcp -m tcp --dport 8082 -j DNAT --to-destination 10.4.0.10:80
23+
//
24+
// -A CNI-DN-2e2f8d5b91929ef9fc152 -d 127.0.0.1/32 -p tcp -m tcp --dport 8081 -j DNAT --to-destination 10.4.0.7:80
25+
// -A CNI-DN-04579c7bb67f4c3f6cca0 -p tcp -m tcp --dport 8082 -j DNAT --to-destination 10.4.0.10:80
26+
//
2527
// The -A on the front is to amend the rule that was already created. portmap
2628
// ensures the rule is created before creating this line so it is always -A.
2729
// CNI-DN- is the prefix used for rule for an individual container.

pkg/limayaml/defaults.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,10 +70,10 @@ func MACAddress(uniqueID string) string {
7070
// matching rule terminates the search).
7171
//
7272
// Exceptions:
73-
// - Mounts are appended in d, y, o order, but "merged" when the Location matches a previous entry;
74-
// the highest priority Writable setting wins.
75-
// - DNS are picked from the highest priority where DNS is not empty.
76-
// - CACertificates Files and Certs are uniquely appended
73+
// - Mounts are appended in d, y, o order, but "merged" when the Location matches a previous entry;
74+
// the highest priority Writable setting wins.
75+
// - DNS are picked from the highest priority where DNS is not empty.
76+
// - CACertificates Files and Certs are uniquely appended
7777
func FillDefault(y, d, o *LimaYAML, filePath string) {
7878
if y.Arch == nil {
7979
y.Arch = d.Arch

0 commit comments

Comments
 (0)