Skip to content

Commit

Permalink
templates: use yq's indentation style
Browse files Browse the repository at this point in the history
Fix issue 1389 so that we can eventually automate updating yamls (issue 1347) using yq.

Use `git show --ignore-all-space --ignore-blank-lines` to review this commit.

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
  • Loading branch information
AkihiroSuda committed May 12, 2023
1 parent a4fdc5d commit cd16315
Show file tree
Hide file tree
Showing 48 changed files with 1,316 additions and 1,382 deletions.
16 changes: 8 additions & 8 deletions .cirrus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,21 +25,21 @@ task:
EXAMPLE: opensuse.yaml
EXAMPLE: experimental/net-user-v2.yaml
info_script:
- uname -a
- df -T
- ls -l /dev/kvm
- cat /proc/cpuinfo
- uname -a
- df -T
- ls -l /dev/kvm
- cat /proc/cpuinfo
install_deps_script:
- apt-get update
- apt-get install -y --no-install-recommends ca-certificates curl git golang jq openssh-client make netcat ovmf sudo qemu-system-x86 qemu-utils
- apt-get update
- apt-get install -y --no-install-recommends ca-certificates curl git golang jq openssh-client make netcat ovmf sudo qemu-system-x86 qemu-utils
go_cache:
fingerprint_script: uname -s ; cat go.sum
folder: $GOPATH/pkg/mod
build_script: make
install_script: make install
prepare_user_script:
- groupadd -g $(stat -c '%g' /dev/kvm) kvm
- useradd -m -G kvm testuser
- groupadd -g $(stat -c '%g' /dev/kvm) kvm
- useradd -m -G kvm testuser
lima_cache:
fingerprint_script: uname -s ; cat examples/$EXAMPLE
folder: /home/testuser/.cache/lima
Expand Down
8 changes: 4 additions & 4 deletions .github/ISSUE_TEMPLATE/bug_report.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: Bug report
description: Report a potential bug
body:
- type: textarea
attributes:
label: Description
description: Please make sure to include the version of Lima and the host OS
- type: textarea
attributes:
label: Description
description: Please make sure to include the version of Lima and the host OS
12 changes: 6 additions & 6 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
blank_issues_enabled: true
contact_links:
- name: Ask a question (GitHub Discussions)
url: https://github.com/lima-vm/lima/discussions
about: We use GitHub Discussions for questions, GitHub issues for tracking bug reports and feature requests
- name: Chat with Lima users and developers
url: https://slack.cncf.io/
about: CNCF slack has `#lima` channel
- name: Ask a question (GitHub Discussions)
url: https://github.com/lima-vm/lima/discussions
about: We use GitHub Discussions for questions, GitHub issues for tracking bug reports and feature requests
- name: Chat with Lima users and developers
url: https://slack.cncf.io/
about: CNCF slack has `#lima` channel
6 changes: 3 additions & 3 deletions .github/ISSUE_TEMPLATE/feature_request.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: Feature request
description: Request a feature
body:
- type: textarea
attributes:
label: Description
- type: textarea
attributes:
label: Description
28 changes: 14 additions & 14 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
version: 2
updates:
- package-ecosystem: gomod
directory: "/"
schedule:
interval: daily
open-pull-requests-limit: 10
reviewers:
- AkihiroSuda
- package-ecosystem: github-actions
directory: "/"
schedule:
interval: daily
open-pull-requests-limit: 10
reviewers:
- AkihiroSuda
- package-ecosystem: gomod
directory: "/"
schedule:
interval: daily
open-pull-requests-limit: 10
reviewers:
- AkihiroSuda
- package-ecosystem: github-actions
directory: "/"
schedule:
interval: daily
open-pull-requests-limit: 10
reviewers:
- AkihiroSuda
148 changes: 74 additions & 74 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ name: Release
on:
push:
branches:
- 'master'
- 'master'
tags:
- 'v*'
- 'v*'
pull_request:
branches:
- 'master'
- 'master'
env:
GO111MODULE: on
jobs:
Expand All @@ -19,84 +19,84 @@ jobs:
runs-on: macos-12
timeout-minutes: 20
steps:
- name: "Switch Xcode version to enable macOS 13 SDK"
# Xcode 14.1 added support for macOS 13 SDK.
# The default version is still 14.0.1, as of November 2022.
# https://github.com/actions/runner-images/blob/main/images/macos/macos-12-Readme.md#xcode
run: |
sudo xcode-select --switch /Applications/Xcode_14.1.app
xcrun --show-sdk-version
- uses: actions/setup-go@v4
with:
go-version: 1.20.x
- uses: actions/checkout@v3
with:
fetch-depth: 1
- name: Make darwin artifacts
run: make artifacts-darwin
- name: "Upload artifacts"
uses: actions/upload-artifact@v3
with:
name: artifacts-darwin
path: _artifacts/
- name: "Switch Xcode version to enable macOS 13 SDK"
# Xcode 14.1 added support for macOS 13 SDK.
# The default version is still 14.0.1, as of November 2022.
# https://github.com/actions/runner-images/blob/main/images/macos/macos-12-Readme.md#xcode
run: |
sudo xcode-select --switch /Applications/Xcode_14.1.app
xcrun --show-sdk-version
- uses: actions/setup-go@v4
with:
go-version: 1.20.x
- uses: actions/checkout@v3
with:
fetch-depth: 1
- name: Make darwin artifacts
run: make artifacts-darwin
- name: "Upload artifacts"
uses: actions/upload-artifact@v3
with:
name: artifacts-darwin
path: _artifacts/
release:
runs-on: ubuntu-22.04
needs: artifacts-darwin
timeout-minutes: 20
steps:
- uses: actions/checkout@v3
- uses: actions/download-artifact@v3
with:
name: artifacts-darwin
path: _artifacts/
- uses: actions/setup-go@v4
with:
go-version: 1.20.x
- name: Install gcc-aarch64-linux-gnu
run: |
sudo apt-get update
sudo apt-get install -y gcc-aarch64-linux-gnu
- name: "Compile binaries"
run: make artifacts-linux
- name: "Make misc artifacts"
run: make artifacts-misc
- name: "SHA256SUMS"
run: |
( cd _artifacts; sha256sum *.tar.gz ) | tee /tmp/SHA256SUMS
mv /tmp/SHA256SUMS _artifacts/SHA256SUMS
- name: "The sha256sum of the SHA256SUMS file"
run: (cd _artifacts; sha256sum SHA256SUMS)
- name: "Prepare the release note"
run: |
tag="${GITHUB_REF##*/}"
shasha=$(sha256sum _artifacts/SHA256SUMS | awk '{print $1}')
cat <<-EOF | tee /tmp/release-note.txt
${tag}
- uses: actions/checkout@v3
- uses: actions/download-artifact@v3
with:
name: artifacts-darwin
path: _artifacts/
- uses: actions/setup-go@v4
with:
go-version: 1.20.x
- name: Install gcc-aarch64-linux-gnu
run: |
sudo apt-get update
sudo apt-get install -y gcc-aarch64-linux-gnu
- name: "Compile binaries"
run: make artifacts-linux
- name: "Make misc artifacts"
run: make artifacts-misc
- name: "SHA256SUMS"
run: |
( cd _artifacts; sha256sum *.tar.gz ) | tee /tmp/SHA256SUMS
mv /tmp/SHA256SUMS _artifacts/SHA256SUMS
- name: "The sha256sum of the SHA256SUMS file"
run: (cd _artifacts; sha256sum SHA256SUMS)
- name: "Prepare the release note"
run: |
tag="${GITHUB_REF##*/}"
shasha=$(sha256sum _artifacts/SHA256SUMS | awk '{print $1}')
cat <<-EOF | tee /tmp/release-note.txt
${tag}
(Changes to be documented)
(Changes to be documented)
## Usage
\`\`\`console
[macOS]$ limactl start
...
INFO[0029] READY. Run \`lima\` to open the shell.
## Usage
\`\`\`console
[macOS]$ limactl start
...
INFO[0029] READY. Run \`lima\` to open the shell.
[macOS]$ lima uname
Linux
\`\`\`
[macOS]$ lima uname
Linux
\`\`\`
- - -
The binaries were built automatically on GitHub Actions.
The build log is available for 90 days: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}
- - -
The binaries were built automatically on GitHub Actions.
The build log is available for 90 days: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}
The sha256sum of the SHA256SUMS file itself is \`${shasha}\` .
EOF
- name: "Create release"
if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v')
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
tag="${GITHUB_REF##*/}"
asset_flags=()
for f in _artifacts/*; do asset_flags+=("-a" "$f"); done
hub release create "${asset_flags[@]}" -F /tmp/release-note.txt --draft "${tag}"
The sha256sum of the SHA256SUMS file itself is \`${shasha}\` .
EOF
- name: "Create release"
if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v')
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
tag="${GITHUB_REF##*/}"
asset_flags=()
for f in _artifacts/*; do asset_flags+=("-a" "$f"); done
hub release create "${asset_flags[@]}" -F /tmp/release-note.txt --draft "${tag}"
Loading

0 comments on commit cd16315

Please sign in to comment.