Skip to content

Commit

Permalink
Fetched template changes and updated dependencies (#9)
Browse files Browse the repository at this point in the history
  • Loading branch information
spietras authored Mar 10, 2024
1 parent b12415d commit 672ecba
Show file tree
Hide file tree
Showing 13 changed files with 209 additions and 201 deletions.
2 changes: 1 addition & 1 deletion .copier-answers.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Changes here will be overwritten by Copier; NEVER EDIT MANUALLY
_commit: 0.4.0
_commit: 0.5.0
_src_path: gh:quickplates/generic
accountname: spietras
description: Terraform resources for my cloud infrastructure 🌎
Expand Down
4 changes: 2 additions & 2 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,11 @@
"ghcr.io/devcontainers/features/nix:1.2.0": {
// Enable experimental features
"extraNixConfig": "experimental-features = nix-command flakes",
"version": "2.19.3"
"version": "2.20.5"
},
// Install Direnv
"ghcr.io/devcontainers-contrib/features/direnv:1.0.2": {
"version": "2.33.0"
"version": "2.34.0"
},
// Install Starship
"ghcr.io/devcontainers-contrib/features/starship:1.0.9": {
Expand Down
2 changes: 1 addition & 1 deletion .devcontainer/image/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# It also has git, zsh and a bunch of other stuff preinstalled
# Also, it includes a non-root 'vscode' user with sudo access
# The version is pinned to ensure reproducibility
FROM mcr.microsoft.com/devcontainers/base:1.0.20-ubuntu-22.04
FROM mcr.microsoft.com/devcontainers/base:1.0.22-ubuntu-22.04

ENV REMOTE_USER=vscode

Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/apply.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,13 @@ jobs:
- name: Checkout code
uses: actions/[email protected]
- name: Setup Nix cache
uses: actions/[email protected].0
uses: actions/[email protected].1
id: cache-nix
with:
path: ${{ env.NIX_CACHE_DIR }}
key: apply-nix
- name: Setup Terraform cache
uses: actions/[email protected].0
uses: actions/[email protected].1
id: cache-terraform
with:
path: ${{ env.TERRAFORM_CACHE_DIR }}
Expand All @@ -63,10 +63,10 @@ jobs:
--parents
${{ env.TERRAFORM_CACHE_DIR }}
- name: Install Nix
uses: cachix/install-nix-action@v25
uses: cachix/install-nix-action@v26
with:
github_access_token: ${{ github.token }}
install_url: https://releases.nixos.org/nix/nix-2.19.3/install
install_url: https://releases.nixos.org/nix/nix-2.20.5/install
# See: https://github.com/cachix/install-nix-action/issues/56
- name: Import Nix store cache
if: steps.cache-nix.outputs.cache-hit == 'true'
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/docs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,21 +40,21 @@ jobs:
- name: Checkout code
uses: actions/[email protected]
- name: Setup Nix cache
uses: actions/[email protected].0
uses: actions/[email protected].1
id: cache-nix
with:
path: ${{ env.NIX_CACHE_DIR }}
key: docs-nix
- name: Setup docs modules cache
uses: actions/[email protected].0
uses: actions/[email protected].1
with:
path: docs/node_modules/
key: docs-modules
- name: Install Nix
uses: cachix/install-nix-action@v25
uses: cachix/install-nix-action@v26
with:
github_access_token: ${{ github.token }}
install_url: https://releases.nixos.org/nix/nix-2.19.3/install
install_url: https://releases.nixos.org/nix/nix-2.20.5/install
# See: https://github.com/cachix/install-nix-action/issues/56
- name: Import Nix store cache
if: steps.cache-nix.outputs.cache-hit == 'true'
Expand All @@ -78,7 +78,7 @@ jobs:
- name: Setup Pages
uses: actions/[email protected]
- name: Upload artifact
uses: actions/[email protected].0
uses: actions/[email protected].1
with:
path: docs/build/
# See: https://github.com/cachix/install-nix-action/issues/56
Expand Down Expand Up @@ -112,4 +112,4 @@ jobs:
steps:
- name: Deploy to GitHub Pages
id: deployment
uses: actions/[email protected].3
uses: actions/[email protected].4
10 changes: 5 additions & 5 deletions .github/workflows/lint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,26 +38,26 @@ jobs:
origin
${{ github.event.pull_request.base.ref }}
- name: Setup Nix cache
uses: actions/[email protected].0
uses: actions/[email protected].1
id: cache-nix
with:
path: ${{ env.NIX_CACHE_DIR }}
key: lint-nix
- name: Setup Trunk cache
uses: actions/[email protected].0
uses: actions/[email protected].1
with:
path: ${{ env.TRUNK_CACHE_DIR }}
key: lint-trunk
- name: Setup docs modules cache
uses: actions/[email protected].0
uses: actions/[email protected].1
with:
path: docs/node_modules/
key: lint-docs-modules
- name: Install Nix
uses: cachix/install-nix-action@v25
uses: cachix/install-nix-action@v26
with:
github_access_token: ${{ github.token }}
install_url: https://releases.nixos.org/nix/nix-2.19.3/install
install_url: https://releases.nixos.org/nix/nix-2.20.5/install
# See: https://github.com/cachix/install-nix-action/issues/56
- name: Import Nix store cache
if: steps.cache-nix.outputs.cache-hit == 'true'
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/plan.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,13 @@ jobs:
- name: Checkout code
uses: actions/[email protected]
- name: Setup Nix cache
uses: actions/[email protected].0
uses: actions/[email protected].1
id: cache-nix
with:
path: ${{ env.NIX_CACHE_DIR }}
key: plan-nix
- name: Setup Terraform cache
uses: actions/[email protected].0
uses: actions/[email protected].1
id: cache-terraform
with:
path: ${{ env.TERRAFORM_CACHE_DIR }}
Expand All @@ -57,10 +57,10 @@ jobs:
--parents
${{ env.TERRAFORM_CACHE_DIR }}
- name: Install Nix
uses: cachix/install-nix-action@v25
uses: cachix/install-nix-action@v26
with:
github_access_token: ${{ github.token }}
install_url: https://releases.nixos.org/nix/nix-2.19.3/install
install_url: https://releases.nixos.org/nix/nix-2.20.5/install
# See: https://github.com/cachix/install-nix-action/issues/56
- name: Import Nix store cache
if: steps.cache-nix.outputs.cache-hit == 'true'
Expand Down
24 changes: 12 additions & 12 deletions .trunk/trunk.yaml
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
version: 0.1
cli:
version: 1.19.0
version: 1.20.1
plugins:
sources:
- id: trunk
ref: v1.4.2
ref: v1.4.4
uri: https://github.com/trunk-io/plugins
runtimes:
enabled:
# Needed for gitleaks, shfmt
- go@1.21.6
- go@1.22.1
# Needed for eslint, markdownlint, prettier, svgo
- node@20.11.0
- node@21.7.1
# Needed for yamllint
- [email protected]
lint:
Expand Down Expand Up @@ -57,30 +57,30 @@ lint:
success_codes: [0, 1]
enabled:
# GitHub Actions linting
- [email protected].26
- [email protected].27
# JavaScript linting
- eslint@8.56.0
- eslint@8.57.0
# Check for whitespace errors
- git-diff-check
# Check for secrets in the code
- [email protected].1
- [email protected].2
# Markdown linting
- markdownlint@0.38.0
- markdownlint@0.39.0
# Nix formatting check
- nix-fmt-check@SYSTEM
# Nix flake check
- nix-flake-check@SYSTEM
# JS, JSON, YAML, Markdown formatting
- [email protected]
# Shell linting
- shellcheck@0.9.0
- shellcheck@0.10.0
# Shell formatting
- shfmt@3.7.0
- shfmt@3.8.0
# SVG formatting
- [email protected]
# Terraform formatting
- terraform@1.6.4
- terraform@1.7.4
# Terraform linting
- [email protected]
# YAML linting
- yamllint@1.33.0
- yamllint@1.35.1
Loading

0 comments on commit 672ecba

Please sign in to comment.