Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Run refresh keys with pacman on Arch Linux #1850

Merged
merged 5 commits into from
Aug 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/pre-commit-action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ jobs:

- uses: actions/checkout@v3

- name: Set up Python 3.9
- name: Set up Python 3.10
uses: actions/setup-python@v4
with:
python-version: "3.9"
python-version: "3.10"

- name: Setup Packer
uses: hashicorp-contrib/setup-packer@v2
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ Gemfile.lock
.bundle/
.kitchen/
*.sw[a-p]
__pycache__

# From os-images
packer_cache
Expand Down
26 changes: 13 additions & 13 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,37 +41,37 @@ repos:
# types: [file]

# ----- Formatting ---------------------------------------------------------------------------->
- repo: https://github.com/asottile/reorder_python_imports
rev: v3.8.2
hooks:
- id: reorder-python-imports
args:
- --py38-plus
- --add-import=from __future__ import annotations
# - repo: https://github.com/asottile/reorder_python_imports
# rev: v3.13.0
# hooks:
# - id: reorder-python-imports
# args:
# - --py310-plus
# - --add-import=from __future__ import annotations

- repo: https://github.com/asottile/pyupgrade
rev: v2.37.3
rev: v3.17.0
hooks:
- id: pyupgrade
name: Rewrite Code to be Py3.8+
name: Rewrite Code to be Py3.10+
args: [
--py37-plus
--py310-plus
]

- repo: https://github.com/psf/black
rev: 22.6.0
rev: 24.8.0
hooks:
- id: black
args: [-l 100]

- repo: https://github.com/asottile/blacken-docs
rev: v1.12.1
rev: 1.18.0
hooks:
- id: blacken-docs
args: [--skip-errors]
files: ^(docs/.*\.rst|src/hbneat/.*\.py)$
additional_dependencies:
- black==22.6.0.
- black==24.8.0
# <---- Formatting -----------------------------------------------------------------------------

# ----- Code Analysis ------------------------------------------------------------------------->
Expand Down
4 changes: 2 additions & 2 deletions golden-state-tree/pkgs/npm.sls
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@

# Suse does not package npm separately
{%- if suse %}
{%- set npm = 'npm18' %}
{%- set nodejs = 'nodejs18' %}
{%- set npm = 'npm20' %}
{%- set nodejs = 'nodejs20' %}
{%- elif ubuntu %}
{%- set npm = 'npm' %}
{%- set nodejs = 'nodejs' %}
Expand Down
2 changes: 1 addition & 1 deletion os-images/AWS/almalinux/almalinux.pkr.hcl
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ variable "salt_provision_type" {

variable "salt_provision_version" {
type = string
default = "3006.8"
default = "3006.9"
}

variable "salt_provision_root_dir" {
Expand Down
2 changes: 1 addition & 1 deletion os-images/AWS/amazonlinux/amazonlinux.pkr.hcl
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ variable "salt_provision_type" {

variable "salt_provision_version" {
type = string
default = "3006.8"
default = "3006.9"
}

variable "salt_provision_root_dir" {
Expand Down
2 changes: 1 addition & 1 deletion os-images/AWS/amazonlinux2000/amazonlinux2000.pkr.hcl
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ variable "salt_provision_type" {

variable "salt_provision_version" {
type = string
default = "3006.8"
default = "3006.9"
}

variable "salt_provision_root_dir" {
Expand Down
3 changes: 2 additions & 1 deletion os-images/AWS/archlinux/archlinux.pkr.hcl
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ variable "salt_provision_type" {

variable "salt_provision_version" {
type = string
default = "3006.8"
default = "3006.9"
}

variable "salt_provision_root_dir" {
Expand Down Expand Up @@ -177,6 +177,7 @@ build {
"systemctl mask tmp.mount",
"pacman-key --init",
"pacman-key --populate",
"pacman-key --refresh-keys",
"reflector --country '' --protocol https --score 20 --sort rate --save /etc/pacman.d/mirrorlist || true",
"pacman-db-upgrade",
"pacman -Sy --noconfirm --needed archlinux-keyring",
Expand Down
2 changes: 1 addition & 1 deletion os-images/AWS/debian/debian.pkr.hcl
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ variable "salt_provision_type" {

variable "salt_provision_version" {
type = string
default = "3006.8"
default = "3006.9"
}

variable "salt_provision_root_dir" {
Expand Down
2 changes: 1 addition & 1 deletion os-images/AWS/fedora/fedora.pkr.hcl
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ variable "salt_provision_type" {

variable "salt_provision_version" {
type = string
default = "3006.8"
default = "3006.9"
}

variable "salt_provision_root_dir" {
Expand Down
2 changes: 1 addition & 1 deletion os-images/AWS/opensuse/opensuse.pkr.hcl
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ variable "salt_provision_type" {

variable "salt_provision_version" {
type = string
default = "3006.8"
default = "3006.9"
}

variable "salt_provision_root_dir" {
Expand Down
2 changes: 1 addition & 1 deletion os-images/AWS/photon/photon.pkr.hcl
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ variable "salt_provision_type" {

variable "salt_provision_version" {
type = string
default = "3006.8"
default = "3006.9"
}

variable "salt_provision_root_dir" {
Expand Down
2 changes: 1 addition & 1 deletion os-images/AWS/rockylinux/rockylinux.pkr.hcl
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ variable "salt_provision_type" {

variable "salt_provision_version" {
type = string
default = "3006.8"
default = "3006.9"
}

variable "salt_provision_root_dir" {
Expand Down
2 changes: 1 addition & 1 deletion os-images/AWS/ubuntu/ubuntu.pkr.hcl
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ variable "salt_provision_type" {

variable "salt_provision_version" {
type = string
default = "3006.8"
default = "3006.9"
}

variable "salt_provision_root_dir" {
Expand Down
2 changes: 1 addition & 1 deletion os-images/AWS/windows/windows.pkr.hcl
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ variable "salt_provision_type" {

variable "salt_provision_version" {
type = string
default = "3006.8"
default = "3006.9"
}

variable "salt_provision_root_dir" {
Expand Down
2 changes: 1 addition & 1 deletion requirements/tools.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# This file is autogenerated by pip-compile with Python 3.9
# This file is autogenerated by pip-compile with Python 3.10
# by the following command:
#
# pip-compile --output-file=requirements/tools.txt --resolver=backtracking requirements/tools.in
Expand Down
1 change: 1 addition & 0 deletions tools/ci.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
"""
GitHub Actions CI Utilities.
"""

from __future__ import annotations

import json
Expand Down
1 change: 1 addition & 0 deletions tools/images.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
"""
AWS EC2 AMI Related Commands.
"""

from __future__ import annotations

import json
Expand Down
Loading