Skip to content

Commit 6aeb87e

Browse files
authored
Merge branch 'named-data:master' into master
2 parents fa09ba1 + e3d432a commit 6aeb87e

File tree

3 files changed

+38
-51
lines changed

3 files changed

+38
-51
lines changed

.github/workflows/build.yml

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,35 @@
1-
---
2-
name: build
1+
name: Build
32
on:
43
push:
54
pull_request:
65

6+
permissions:
7+
contents: read
8+
79
jobs:
810
build:
11+
runs-on: ${{ matrix.os }}
912
strategy:
1013
matrix:
11-
os: ['ubuntu-20.04', 'windows-2019', 'macos-10.15']
14+
os: [ubuntu-20.04, ubuntu-22.04,
15+
macos-11, macos-12,
16+
windows-2019, windows-2022]
1217
fail-fast: false
13-
runs-on: ${{ matrix.os }}
1418
steps:
15-
- uses: actions/setup-go@v2
19+
- name: Install Go
20+
uses: actions/setup-go@v3
1621
with:
1722
go-version: "^1.18"
18-
- uses: actions/checkout@v2
19-
- name: build without cgo
23+
- name: Checkout repository
24+
uses: actions/checkout@v3
25+
- name: Build without cgo
2026
run: make
2127
env:
2228
CGO_ENABLED: 0
23-
- name: install cgo dependencies (Linux)
24-
run: sudo apt-get install libpcap-dev
25-
if: ${{ matrix.os == 'ubuntu-20.04' }}
26-
- name: build with cgo
29+
- name: Install cgo dependencies (Linux)
30+
run: sudo apt-get -qy install libpcap-dev
31+
if: ${{ runner.os == 'Linux' }}
32+
- name: Build with cgo
2733
run: make
2834
env:
2935
CGO_ENABLED: 1

.github/workflows/codeql-analysis.yml

Lines changed: 11 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,3 @@
1-
# For most projects, this workflow file will not need changing; you simply need
2-
# to commit it to your repository.
3-
#
4-
# You may wish to alter this file to override the set of languages analyzed,
5-
# or to provide custom queries or build logic.
6-
#
7-
# ******** NOTE ********
8-
# We have attempted to detect the languages in your repository. Please check
9-
# the `language` matrix defined below to confirm you have the correct set of
10-
# supported CodeQL languages.
11-
#
121
name: "CodeQL"
132

143
on:
@@ -33,39 +22,29 @@ jobs:
3322
fail-fast: false
3423
matrix:
3524
language: [ 'go' ]
36-
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ]
37-
# Learn more:
38-
# https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed
25+
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
26+
# Use only 'java' to analyze code written in Java, Kotlin or both
27+
# Use only 'javascript' to analyze code written in JavaScript, TypeScript or both
28+
# Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
3929

4030
steps:
4131
- name: Checkout repository
42-
uses: actions/checkout@v2
32+
uses: actions/checkout@v3
4333

4434
# Initializes the CodeQL tools for scanning.
4535
- name: Initialize CodeQL
46-
uses: github/codeql-action/init@v1
36+
uses: github/codeql-action/init@v2
4737
with:
4838
languages: ${{ matrix.language }}
4939
# If you wish to specify custom queries, you can do so here or in a config file.
5040
# By default, queries listed here will override any specified in a config file.
5141
# Prefix the list here with "+" to use these queries and those in the config file.
52-
# queries: ./path/to/local/query, your-org/your-repo/queries@main
42+
# Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
43+
# queries: security-extended,security-and-quality
5344

54-
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
55-
# If this step fails, then you should remove it and run the build manually (see below)
45+
# Autobuild attempts to build any compiled languages (C/C++, C#, Go, or Java).
5646
- name: Autobuild
57-
uses: github/codeql-action/autobuild@v1
58-
59-
# ℹ️ Command-line programs to run using the OS shell.
60-
# 📚 https://git.io/JvXDl
61-
62-
# ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
63-
# and modify them (or add more) to build your code if your project
64-
# uses a compiled language
65-
66-
#- run: |
67-
# make bootstrap
68-
# make release
47+
uses: github/codeql-action/autobuild@v2
6948

7049
- name: Perform CodeQL Analysis
71-
uses: github/codeql-action/analyze@v1
50+
uses: github/codeql-action/analyze@v2

.github/workflows/test.yml

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,24 @@
1-
---
2-
name: test
3-
on: [push, pull_request]
1+
name: Test
2+
on:
3+
push:
4+
pull_request:
5+
46
jobs:
57
test:
8+
runs-on: ${{ matrix.os }}
69
strategy:
710
matrix:
811
go-version: [1.18.x]
912
os: [ubuntu-latest]
10-
runs-on: ${{ matrix.os }}
13+
fail-fast: false
1114
steps:
1215
- name: Install Go
13-
uses: actions/setup-go@v2
16+
uses: actions/setup-go@v3
1417
with:
1518
go-version: ${{ matrix.go-version }}
1619
- name: Checkout repository
17-
uses: actions/checkout@v2
18-
- name: Go Imports Check
20+
uses: actions/checkout@v3
21+
- name: Go imports check
1922
uses: zjkmxy/golang-github-actions@v1.1.1
2023
with:
2124
run: imports
@@ -24,4 +27,3 @@ jobs:
2427
run: go test ./...
2528
env:
2629
CGO_ENABLED: 0
27-

0 commit comments

Comments
 (0)