github/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/ZeroTier/ZeroTierOne synced 2025-08-22 06:14:02 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'dev' into peer-metrics

Browse source
This commit is contained in:
Grant Limberg 2023-05-01 17:27:44 -07:00 • committed by GitHub
commit 50bdfb59a3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

45
.github/workflows/build.yml vendored
View file

@ -19,17 +19,14 @@ jobs:
components: rustfmt, clippy components: rustfmt, clippy
- name: Set up cargo cache - name: Set up cargo cache
uses: actions/cache@v3 uses: Swatinem/rust-cache@v2
continue-on-error: false continue-on-error: false
with: with:
path: | key: ${{ runner.os }}-cargo-${{ hashFiles('zeroidc//Cargo.lock') }}
~/.cargo/bin/ shared-key: ${{ runner.os }}-cargo-
~/.cargo/registry/index/ workspaces: |
~/.cargo/registry/cache/ zeroidc/
~/.cargo/git/db/
target/
key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
restore-keys: ${{ runner.os }}-cargo-
- name: make - name: make
run: make run: make
- name: selftest - name: selftest
@ -54,17 +51,14 @@ jobs:
override: true override: true
components: rustfmt, clippy components: rustfmt, clippy
- name: Set up cargo cache - name: Set up cargo cache
uses: actions/cache@v3 uses: Swatinem/rust-cache@v2
continue-on-error: false continue-on-error: false
with: with:
path: | key: ${{ runner.os }}-cargo-${{ hashFiles('zeroidc//Cargo.lock') }}
~/.cargo/bin/ shared-key: ${{ runner.os }}-cargo-
~/.cargo/registry/index/ workspaces: |
~/.cargo/registry/cache/ zeroidc/
~/.cargo/git/db/
target/
key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
restore-keys: ${{ runner.os }}-cargo-
- name: make - name: make
run: make run: make
- name: selftest - name: selftest
@ -89,17 +83,14 @@ jobs:
override: true override: true
components: rustfmt, clippy components: rustfmt, clippy
- name: Set up cargo cache - name: Set up cargo cache
uses: actions/cache@v3 uses: Swatinem/rust-cache@v2
continue-on-error: false continue-on-error: false
with: with:
path: | key: ${{ runner.os }}-cargo-${{ hashFiles('zeroidc//Cargo.lock') }}
~/.cargo/bin/ shared-key: ${{ runner.os }}-cargo-
~/.cargo/registry/index/ workspaces: |
~/.cargo/registry/cache/ zeroidc/
~/.cargo/git/db/
target/
key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
restore-keys: ${{ runner.os }}-cargo-
- name: setup msbuild - name: setup msbuild
uses: microsoft/setup-msbuild@v1.1.3 uses: microsoft/setup-msbuild@v1.1.3
- name: msbuild - name: msbuild

15
.github/workflows/validate.yml vendored
View file

@ -22,17 +22,13 @@ jobs:
components: rustfmt, clippy components: rustfmt, clippy
- name: Set up cargo cache - name: Set up cargo cache
uses: actions/cache@v3 uses: Swatinem/rust-cache@v2
continue-on-error: false continue-on-error: false
with: with:
path: | key: ${{ runner.os }}-cargo-${{ hashFiles('zeroidc//Cargo.lock') }}
~/.cargo/bin/ shared-key: ${{ runner.os }}-cargo-
~/.cargo/registry/index/ workspaces: |
~/.cargo/registry/cache/ zeroidc/
~/.cargo/git/db/
**/target/
key: ${{ runner.os }}-cargo-${{ hashFiles('Cargo.lock') }}
restore-keys: ${{ runner.os }}-cargo-
- name: validate-1m-linux - name: validate-1m-linux
env: env:
@ -55,3 +51,4 @@ jobs:
run: | run: |
sudo chmod +x ./.github/workflows/report.sh sudo chmod +x ./.github/workflows/report.sh
sudo ./.github/workflows/report.sh sudo ./.github/workflows/report.sh