Skip to content

Commit e32301f

Browse files
phip1611nicholasbishop
authored andcommitted
fmt: use yamlfmt for our yml files
1 parent 0a3c709 commit e32301f

File tree

7 files changed

+137
-186
lines changed

7 files changed

+137
-186
lines changed

.github/dependabot.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
version: 2
22
updates:
3-
- package-ecosystem: cargo
4-
directory: "/"
5-
schedule:
6-
interval: daily
7-
open-pull-requests-limit: 10
8-
ignore:
9-
- dependency-name: "*"
10-
update-types: ["version-update:semver-patch"]
3+
- package-ecosystem: cargo
4+
directory: "/"
5+
schedule:
6+
interval: daily
7+
open-pull-requests-limit: 10
8+
ignore:
9+
- dependency-name: "*"
10+
update-types: ["version-update:semver-patch"]

.github/workflows/book.yml

Lines changed: 32 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,44 @@
11
name: Book
2-
32
on:
43
push:
5-
branches: [ main ]
6-
4+
branches: [main]
75
permissions:
86
contents: write
9-
107
# Adapted from:
118
# https://github.com/rust-lang/mdBook/wiki/Automated-Deployment%3A-GitHub-Actions#github-pages-deploy
129
jobs:
1310
deploy:
1411
if: github.repository == 'rust-osdev/uefi-rs'
1512
runs-on: ubuntu-latest
1613
steps:
17-
- uses: actions/checkout@v3
18-
with:
19-
fetch-depth: 0
20-
- name: Install mdbook
21-
run: |
22-
mkdir mdbook
23-
curl -sSL https://github.com/rust-lang/mdBook/releases/download/v0.4.21/mdbook-v0.4.21-x86_64-unknown-linux-gnu.tar.gz | tar -xz --directory=./mdbook
24-
echo `pwd`/mdbook >> $GITHUB_PATH
25-
- name: Deploy GitHub Pages
26-
run: |
27-
cd book
28-
mdbook build
29-
git worktree add gh-pages gh-pages
30-
git config user.name "Deploy from CI"
31-
git config user.email ""
32-
cd gh-pages
33-
# Delete the ref to avoid keeping history.
34-
git update-ref -d refs/heads/gh-pages
35-
# Place the book under a "HEAD" directory so that we can later
36-
# add other versions (e.g. "stable" or "v0.17") without breaking
37-
# URLs.
38-
rm -rf HEAD
39-
mv ../book HEAD
40-
git add HEAD
41-
# Add an index in the root to redirect to HEAD. If we eventually
42-
# serve multiple versions, this can be changed to a real index.
43-
cp ../head_redirect.html index.html
44-
git add index.html
45-
# Commit and push.
46-
git commit -m "Deploy $GITHUB_SHA to gh-pages"
47-
git push --force
14+
- uses: actions/checkout@v3
15+
with:
16+
fetch-depth: 0
17+
- name: Install mdbook
18+
run: |
19+
mkdir mdbook
20+
curl -sSL https://github.com/rust-lang/mdBook/releases/download/v0.4.21/mdbook-v0.4.21-x86_64-unknown-linux-gnu.tar.gz | tar -xz --directory=./mdbook
21+
echo `pwd`/mdbook >> $GITHUB_PATH
22+
- name: Deploy GitHub Pages
23+
run: |
24+
cd book
25+
mdbook build
26+
git worktree add gh-pages gh-pages
27+
git config user.name "Deploy from CI"
28+
git config user.email ""
29+
cd gh-pages
30+
# Delete the ref to avoid keeping history.
31+
git update-ref -d refs/heads/gh-pages
32+
# Place the book under a "HEAD" directory so that we can later
33+
# add other versions (e.g. "stable" or "v0.17") without breaking
34+
# URLs.
35+
rm -rf HEAD
36+
mv ../book HEAD
37+
git add HEAD
38+
# Add an index in the root to redirect to HEAD. If we eventually
39+
# serve multiple versions, this can be changed to a real index.
40+
cp ../head_redirect.html index.html
41+
git add index.html
42+
# Commit and push.
43+
git commit -m "Deploy $GITHUB_SHA to gh-pages"
44+
git push --force
Lines changed: 18 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
name: Developer Productivity
2-
32
on:
43
push:
54
pull_request:
6-
75
jobs:
86
# Job to run change detection
97
changes:
@@ -21,7 +19,6 @@ jobs:
2119
nix-src:
2220
- 'nix/**'
2321
- 'shell.nix'
24-
2522
# This is a convenience test to verify that the toolchain provided by
2623
# shell.nix is valid and can build + run the integration test.
2724
#
@@ -32,21 +29,21 @@ jobs:
3229
if: ${{ needs.changes.outputs.nix-src == 'true' }}
3330
runs-on: ubuntu-latest
3431
steps:
35-
- name: Checkout sources
36-
uses: actions/checkout@v3
37-
- uses: Swatinem/rust-cache@v2
38-
- uses: cachix/install-nix-action@v20
39-
with:
40-
# This channel is only required to invoke "nix-shell".
41-
# Everything inside that nix-shell will use a pinned version of nixpkgs.
42-
nix_path: nixpkgs=channel:nixos-23.05
43-
# Dedicated step to separate all the
44-
# "copying path '/nix/store/...' from 'https://cache.nixos.org'."
45-
# messages from the actual build output. This job takes ~60secs.
46-
- name: Prepare Nix Store
47-
run: nix-shell --pure --run "cargo --version"
48-
- name: Run VM tests
49-
run: |
50-
COMMAND="cargo +stable xtask run --target x86_64 --headless --ci --tpm=v1"
51-
echo "Executing in nix shell now: $COMMAND"
52-
nix-shell --pure --run "$COMMAND"
32+
- name: Checkout sources
33+
uses: actions/checkout@v3
34+
- uses: Swatinem/rust-cache@v2
35+
- uses: cachix/install-nix-action@v20
36+
with:
37+
# This channel is only required to invoke "nix-shell".
38+
# Everything inside that nix-shell will use a pinned version of nixpkgs.
39+
nix_path: nixpkgs=channel:nixos-23.05
40+
# Dedicated step to separate all the
41+
# "copying path '/nix/store/...' from 'https://cache.nixos.org'."
42+
# messages from the actual build output. This job takes ~60secs.
43+
- name: Prepare Nix Store
44+
run: nix-shell --pure --run "cargo --version"
45+
- name: Run VM tests
46+
run: |
47+
COMMAND="cargo +stable xtask run --target x86_64 --headless --ci --tpm=v1"
48+
echo "Executing in nix shell now: $COMMAND"
49+
nix-shell --pure --run "$COMMAND"

.github/workflows/qa.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
name: QA
2-
3-
on: [ push, pull_request ]
4-
2+
on: [push, pull_request]
53
jobs:
64
spellcheck:
75
name: Spellcheck

0 commit comments

Comments
 (0)