diff options
| author |  netblue30 <netblue30@protonmail.com> | 2022-04-25 15:34:38 -0400 |
|---|---|---|
| committer | netblue30 <netblue30@protonmail.com> | 2022-04-25 15:34:38 -0400 |
| commit | 9633d7d04e2bb5d6d40a637f60514ff934931fbe (patch) | |
| tree | 66539e99133a3f192665666f2e5e9ab41e08b82b | |
| parent | more on firecfg --guide: fzenity (diff) | |
| parent | build(deps): bump actions/checkout from 3.0.1 to 3.0.2 (diff) | |
| download | firejail-9633d7d04e2bb5d6d40a637f60514ff934931fbe.tar.gz firejail-9633d7d04e2bb5d6d40a637f60514ff934931fbe.tar.zst firejail-9633d7d04e2bb5d6d40a637f60514ff934931fbe.zip | |
Merge branch 'master' of ssh://github.com/netblue30/firejail
| -rw-r--r-- | .github/workflows/build-extra.yml | 6 | ||||
| -rw-r--r-- | .github/workflows/build.yml | 4 | ||||
| -rw-r--r-- | .github/workflows/codeql-analysis.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/profile-checks.yml | 2 |
4 files changed, 8 insertions, 6 deletions
diff --git a/.github/workflows/build-extra.yml b/.github/workflows/build-extra.yml index 4f5fc5049..27f11459c 100644 --- a/.github/workflows/build-extra.yml +++ b/.github/workflows/build-extra.yml | |||
| @@ -30,7 +30,7 @@ jobs: | |||
| 30 | build-clang: | 30 | build-clang: |
| 31 | runs-on: ubuntu-20.04 | 31 | runs-on: ubuntu-20.04 |
| 32 | steps: | 32 | steps: |
| 33 | - uses: actions/checkout@dcd71f646680f2efd8db4afa5ad64fdcba30e748 | 33 | - uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b |
| 34 | - name: configure | 34 | - name: configure |
| 35 | run: CC=clang-11 ./configure --enable-fatal-warnings | 35 | run: CC=clang-11 ./configure --enable-fatal-warnings |
| 36 | - name: make | 36 | - name: make |
| @@ -38,7 +38,7 @@ jobs: | |||
| 38 | scan-build: | 38 | scan-build: |
| 39 | runs-on: ubuntu-20.04 | 39 | runs-on: ubuntu-20.04 |
| 40 | steps: | 40 | steps: |
| 41 | - uses: actions/checkout@dcd71f646680f2efd8db4afa5ad64fdcba30e748 | 41 | - uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b |
| 42 | - name: install clang-tools-11 | 42 | - name: install clang-tools-11 |
| 43 | run: sudo apt-get install clang-tools-11 | 43 | run: sudo apt-get install clang-tools-11 |
| 44 | - name: configure | 44 | - name: configure |
| @@ -48,7 +48,7 @@ jobs: | |||
| 48 | cppcheck: | 48 | cppcheck: |
| 49 | runs-on: ubuntu-20.04 | 49 | runs-on: ubuntu-20.04 |
| 50 | steps: | 50 | steps: |
| 51 | - uses: actions/checkout@dcd71f646680f2efd8db4afa5ad64fdcba30e748 | 51 | - uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b |
| 52 | - name: install cppcheck | 52 | - name: install cppcheck |
| 53 | run: sudo apt-get install cppcheck | 53 | run: sudo apt-get install cppcheck |
| 54 | - name: cppcheck | 54 | - name: cppcheck |
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4d54b5178..faea6970f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml | |||
| @@ -22,7 +22,9 @@ jobs: | |||
| 22 | build_and_test: | 22 | build_and_test: |
| 23 | runs-on: ubuntu-20.04 | 23 | runs-on: ubuntu-20.04 |
| 24 | steps: | 24 | steps: |
| 25 | - uses: actions/checkout@dcd71f646680f2efd8db4afa5ad64fdcba30e748 | 25 | - uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b |
| 26 | - name: update package information | ||
| 27 | run: sudo apt-get update | ||
| 26 | - name: install dependencies | 28 | - name: install dependencies |
| 27 | run: sudo apt-get install gcc-11 libapparmor-dev libselinux1-dev expect xzdec | 29 | run: sudo apt-get install gcc-11 libapparmor-dev libselinux1-dev expect xzdec |
| 28 | - name: configure | 30 | - name: configure |
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 69fc8834b..95f00a34e 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml | |||
| @@ -43,7 +43,7 @@ jobs: | |||
| 43 | 43 | ||
| 44 | steps: | 44 | steps: |
| 45 | - name: Checkout repository | 45 | - name: Checkout repository |
| 46 | uses: actions/checkout@dcd71f646680f2efd8db4afa5ad64fdcba30e748 | 46 | uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b |
| 47 | 47 | ||
| 48 | # Initializes the CodeQL tools for scanning. | 48 | # Initializes the CodeQL tools for scanning. |
| 49 | - name: Initialize CodeQL | 49 | - name: Initialize CodeQL |
diff --git a/.github/workflows/profile-checks.yml b/.github/workflows/profile-checks.yml index 59997db2f..9138e8a57 100644 --- a/.github/workflows/profile-checks.yml +++ b/.github/workflows/profile-checks.yml | |||
| @@ -20,7 +20,7 @@ jobs: | |||
| 20 | profile-checks: | 20 | profile-checks: |
| 21 | runs-on: ubuntu-20.04 | 21 | runs-on: ubuntu-20.04 |
| 22 | steps: | 22 | steps: |
| 23 | - uses: actions/checkout@dcd71f646680f2efd8db4afa5ad64fdcba30e748 | 23 | - uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b |
| 24 | - name: sort.py | 24 | - name: sort.py |
| 25 | run: ./ci/check/profiles/sort.py etc/inc/*.inc etc/{profile-a-l,profile-m-z}/*.profile | 25 | run: ./ci/check/profiles/sort.py etc/inc/*.inc etc/{profile-a-l,profile-m-z}/*.profile |
| 26 | - name: private-etc-always-required.sh | 26 | - name: private-etc-always-required.sh |