From 27e049ea762cfe7cd0e730620a53931ae4d6cb7d Mon Sep 17 00:00:00 2001 From: James McKinney <26463+jpmckinney@users.noreply.github.com> Date: Tue, 11 Jun 2024 18:26:57 -0400 Subject: [PATCH] build: Update to latest profile template --- .github/workflows/shell.yml | 3 ++- common-requirements.txt | 2 +- script/diff | 7 ++++--- script/update | 7 ++++--- 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/.github/workflows/shell.yml b/.github/workflows/shell.yml index e879890..fe96765 100644 --- a/.github/workflows/shell.yml +++ b/.github/workflows/shell.yml @@ -8,6 +8,7 @@ jobs: - uses: actions/checkout@v4 - run: | sudo apt update - sudo apt install shellcheck shfmt + sudo apt install devscripts shellcheck shfmt + - run: checkbashisms $(shfmt -f .) - run: shellcheck $(shfmt -f .) - run: shfmt -d -i 4 -sr $(shfmt -f .) diff --git a/common-requirements.txt b/common-requirements.txt index 46e0887..ff4de52 100644 --- a/common-requirements.txt +++ b/common-requirements.txt @@ -171,7 +171,7 @@ tomli==2.0.1 # pip-tools # pyproject-hooks # pytest -tornado==6.3.3 +tornado==6.4.1 # via livereload trio==0.20.0 # via diff --git a/script/diff b/script/diff index 988c0ff..cf7e850 100755 --- a/script/diff +++ b/script/diff @@ -1,6 +1,7 @@ -#!/usr/bin/env bash -# No -e, because diff fails. -set -uo pipefail +#!/bin/sh + +# No -e, because diff uses exit status 1 when differences are found. +set -u curl -sS https://raw.githubusercontent.com/open-contracting/standard_profile_template/latest/docs/conf.py | diff -u - docs/conf.py diff --git a/script/update b/script/update index ada17ca..cba8c6f 100755 --- a/script/update +++ b/script/update @@ -1,7 +1,8 @@ -#!/usr/bin/env bash -set -euo pipefail +#!/bin/sh -function main { +set -eu + +main() { mkdir -p script include tests for f in Makefile common-requirements.in common-requirements.txt .github/dependabot.yml .github/workflows/lint.yml .github/workflows/shell.yml docs/_static/favicon-16x16.ico include/common.mk include/prologue.mk include/header.html script/diff script/update tests/conftest.py tests/test_common.py; do