Skip to content
This repository has been archived by the owner on Nov 9, 2024. It is now read-only.

Commit

Permalink
Merge base
Browse files Browse the repository at this point in the history 
commit fc04282
Author: Imran Iqbal <iqbalmy@hotmail.com>
Date:   Sun Jul 17 19:49:14 2022 +0100

    chore(gemfile.lock): update to latest gem versions (2022-W28) [skip ci]

    * Automated using myii/ssf-formula#454

commit e7fc7eb
Author: Imran Iqbal <iqbalmy@hotmail.com>
Date:   Thu Jun 30 23:10:19 2022 +0100

    chore(gemfile.lock): update to latest gem versions (2022-W26) [skip ci]

    * Automated using myii/ssf-formula#453

commit 5e5aa74
Author: Imran Iqbal <iqbalmy@hotmail.com>
Date:   Wed Jun 15 23:07:25 2022 +0100

    chore(gemfile.lock): update to latest gem versions (2022-W24) [skip ci]

    * Automated using myii/ssf-formula#452

commit 32518b9
Author: Imran Iqbal <iqbalmy@hotmail.com>
Date:   Thu Jun 9 00:06:47 2022 +0100

    ci: update `pre-commit` configuration inc. for pre-commit.ci [skip ci]

    * Automated using myii/ssf-formula#450

commit 2e2aa10
Author: Imran Iqbal <iqbalmy@hotmail.com>
Date:   Tue Jun 7 23:32:12 2022 +0100

    chore(gemfile.lock): update to latest gem versions (2022-W23) [skip ci]

    * Automated using myii/ssf-formula#449

commit c090f3d
Author: Imran Iqbal <iqbalmy@hotmail.com>
Date:   Mon May 30 17:30:14 2022 +0100

    chore(gemfile.lock): update to latest gem versions (2022-W22) [skip ci]

    * Automated using myii/ssf-formula#447

commit de7e21c
Author: Imran Iqbal <iqbalmy@hotmail.com>
Date:   Tue May 17 13:23:03 2022 +0100

    chore(gemfile.lock): update to latest gem versions (2022-W20) [skip ci]

    * Automated using myii/ssf-formula#444

commit d46507b
Author: Imran Iqbal <iqbalmy@hotmail.com>
Date:   Tue May 17 08:52:39 2022 +0100

    test(system.rb): add support for `mac_os_x` [skip ci]

    * Automated using myii/ssf-formula#442

commit 6ea1cc2
Author: Imran Iqbal <iqbalmy@hotmail.com>
Date:   Tue May 10 10:13:39 2022 +0100

    ci(gitlab-ci): fix test conversion job (reset back to #249) [skip ci]

    * Reset using myii/ssf-formula#440

commit 9349c83
Author: Imran Iqbal <iqbalmy@hotmail.com>
Date:   Tue May 10 10:03:47 2022 +0100

    test(_mapdata): add verification file for `ubuntu-22` [skip ci]

commit 1703b38
Author: Imran Iqbal <iqbalmy@hotmail.com>
Date:   Tue May 10 07:35:02 2022 +0100

    chore(gemfile.lock): update to latest gem versions (2022-W19) [skip ci]

    * Automated using myii/ssf-formula#439

commit e16130d
Author: Imran Iqbal <iqbalmy@hotmail.com>
Date:   Fri May 6 23:19:59 2022 +0100

    chore(gemfile.lock): update to latest gem versions (2022-W18) [skip ci]

    * Automated using myii/ssf-formula#437

commit 0d1f0dd
Author: semantic-release-bot <semantic-release-bot@martynus.net>
Date:   Mon Apr 25 18:27:38 2022 +0000

    chore(release): 5.0.9 [skip ci]

    ## [5.0.9](saltstack-formulas/template-formula@v5.0.8...v5.0.9) (2022-04-25)

    ### Continuous Integration

    * **gitlab-ci:** use Node `16.x` for `pre-commit` in test conversion job ([a1a46ae](saltstack-formulas/template-formula@a1a46ae))
    * **kitchen+gitlab:** update for new pre-salted images [skip ci] ([801be3d](saltstack-formulas/template-formula@801be3d))

    ### Tests

    * **_mapdata:** add verification file for `fedora-35` [skip ci] ([6f02d2c](saltstack-formulas/template-formula@6f02d2c))
    * **_mapdata:** add verification file for `fedora-36` [skip ci] ([4a38a29](saltstack-formulas/template-formula@4a38a29))

commit bdf294e
Merge: 876385a a1a46ae
Author: Imran Iqbal <myii@users.noreply.github.com>
Date:   Mon Apr 25 19:17:08 2022 +0100

    Merge pull request #249 from myii/ci/use-node-16-for-test-conversion-pre-commit

    ci(gitlab-ci): use Node `16.x` for `pre-commit` in test conversion job

commit a1a46ae
Author: Imran Iqbal <iqbalmy@hotmail.com>
Date:   Mon Apr 25 17:49:25 2022 +0100

    ci(gitlab-ci): use Node `16.x` for `pre-commit` in test conversion job

    The `test_conversion` job failed during the weekly testing:

    * https://gitlab.com/myii/template-formula/-/jobs/2371193438

    The `stderr` being:

    ```
    /root/.cache/pre-commit/repomigj3p4n/node_env-default/bin/node:
    /lib/x86_64-linux-gnu/libc.so.6: version `GLIBC_2.28' not found
    (required by /root/.cache/pre-commit/repomigj3p4n/node_env-default/bin/node)
    ```

    The following references led to this resolution:

    * pre-commit/pre-commit#2351
    * https://stackoverflow.com/questions/71939099/bitbucket-pipeline-error-installing-pre-commit-ts-lint

    As mentioned there:

    > a few days ago node 18.x was released and the prebuilt binaries
    > require a relatively-recent version of glibc

    Which obviously isn't available on our current Bionic-based `dind` image,
    i.e. 'myii/ssf-dind-ruby-bionic:2.7.5-1bbox1'.

    While debugging this situation locally, noticed that the use of a
    relative `tmp/...` subdirectory was within the `template-formula`
    directory itself -- so switched this to using `/tmp/...` instead.

commit 876385a
Author: Imran Iqbal <iqbalmy@hotmail.com>
Date:   Mon Apr 25 09:12:54 2022 +0100

    chore(gemfile.lock): update to latest gem versions (2022-W17) [skip ci]

    * Automated using myii/ssf-formula#433
  • Loading branch information
@lkubb
lkubb committed Dec 11, 2022
1 parent 5ad0aa5 commit 9ca3506
Show file tree
Hide file tree
Showing 11 changed files with 160 additions and 124 deletions.
13 changes: 3 additions & 10 deletions {= cookiecutter.abbr =}-formula/.gitlab-ci.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,7 @@ rubocop:
# default-debian-11-tiamat-py3: {extends: '.test_instance'}
# default-debian-10-tiamat-py3: {extends: '.test_instance'}
# default-debian-9-tiamat-py3: {extends: '.test_instance'}
# default-ubuntu-2204-tiamat-py3: {extends: '.test_instance_failure_permitted'}
# default-ubuntu-2004-tiamat-py3: {extends: '.test_instance'}
# default-ubuntu-1804-tiamat-py3: {extends: '.test_instance'}
# default-centos-stream8-tiamat-py3: {extends: '.test_instance_failure_permitted'}
Expand All @@ -147,13 +148,13 @@ rubocop:
default-debian-11-master-py3: {extends: '.test_instance'}
default-debian-10-master-py3: {extends: '.test_instance'}
default-debian-9-master-py3: {extends: '.test_instance'}
default-ubuntu-2204-master-py3: {extends: '.test_instance_failure_permitted'}
default-ubuntu-2004-master-py3: {extends: '.test_instance'}
default-ubuntu-1804-master-py3: {extends: '.test_instance'}
default-centos-stream8-master-py3: {extends: '.test_instance_failure_permitted'}
default-centos-7-master-py3: {extends: '.test_instance'}
default-fedora-36-master-py3: {extends: '.test_instance_failure_permitted'}
default-fedora-35-master-py3: {extends: '.test_instance'}
default-fedora-34-master-py3: {extends: '.test_instance'}
default-opensuse-leap-153-master-py3: {extends: '.test_instance'}
default-opensuse-tmbl-latest-master-py3: {extends: '.test_instance_failure_permitted'}
default-amazonlinux-2-master-py3: {extends: '.test_instance'}
Expand All @@ -167,13 +168,13 @@ default-rockylinux-8-master-py3: {extends: '.test_instance'}
# default-debian-11-3004-1-py3: {extends: '.test_instance'}
# default-debian-10-3004-1-py3: {extends: '.test_instance'}
# default-debian-9-3004-1-py3: {extends: '.test_instance'}
# default-ubuntu-2204-3004-1-py3: {extends: '.test_instance_failure_permitted'}
# default-ubuntu-2004-3004-1-py3: {extends: '.test_instance'}
# default-ubuntu-1804-3004-1-py3: {extends: '.test_instance'}
# default-centos-stream8-3004-1-py3: {extends: '.test_instance_failure_permitted'}
# default-centos-7-3004-1-py3: {extends: '.test_instance'}
# default-fedora-36-3004-1-py3: {extends: '.test_instance_failure_permitted'}
# default-fedora-35-3004-1-py3: {extends: '.test_instance'}
# default-fedora-34-3004-1-py3: {extends: '.test_instance'}
# default-amazonlinux-2-3004-1-py3: {extends: '.test_instance'}
# default-oraclelinux-8-3004-1-py3: {extends: '.test_instance'}
# default-oraclelinux-7-3004-1-py3: {extends: '.test_instance'}
Expand All @@ -194,14 +195,6 @@ default-rockylinux-8-master-py3: {extends: '.test_instance'}
# default-oraclelinux-8-3003-4-py3: {extends: '.test_instance'}
# default-oraclelinux-7-3003-4-py3: {extends: '.test_instance'}
# default-almalinux-8-3003-4-py3: {extends: '.test_instance'}
# default-debian-10-3002-8-py3: {extends: '.test_instance'}
# default-debian-9-3002-8-py3: {extends: '.test_instance'}
# default-ubuntu-2004-3002-8-py3: {extends: '.test_instance'}
# default-ubuntu-1804-3002-8-py3: {extends: '.test_instance'}
# default-centos-7-3002-8-py3: {extends: '.test_instance'}
# default-amazonlinux-2-3002-8-py3: {extends: '.test_instance'}
# default-oraclelinux-8-3002-8-py3: {extends: '.test_instance'}
# default-oraclelinux-7-3002-8-py3: {extends: '.test_instance'}
# yamllint enable rule:line-length

###############################################################################
Expand Down
14 changes: 13 additions & 1 deletion {= cookiecutter.abbr =}-formula/.pre-commit-config.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,18 @@
---
# See https://pre-commit.com for more information
# See https://pre-commit.com/hooks.html for more hooks
ci:
autofix_commit_msg: |
ci(pre-commit.ci): apply auto fixes from pre-commit.com hooks
For more information, see https://pre-commit.ci
autofix_prs: true
autoupdate_branch: ''
autoupdate_commit_msg: |
ci(pre-commit.ci): perform `pre-commit` autoupdate
autoupdate_schedule: quarterly
skip: []
submodules: false
default_stages: [commit]
repos:
- repo: https://github.com/dafyddj/commitlint-pre-commit-hook
Expand All @@ -18,7 +30,7 @@ repos:
additional_dependencies: ['@commitlint/config-conventional@8.3.4']
always_run: true
- repo: https://github.com/rubocop-hq/rubocop
rev: v1.25.1
rev: v1.30.1
hooks:
- id: rubocop
name: Check Ruby files with rubocop
Expand Down
13 changes: 3 additions & 10 deletions {= cookiecutter.abbr =}-formula/.travis.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@ jobs:
# - env: INSTANCE=default-debian-11-tiamat-py3
# - env: INSTANCE=default-debian-10-tiamat-py3
# - env: INSTANCE=default-debian-9-tiamat-py3
# - env: INSTANCE=default-ubuntu-2204-tiamat-py3
# - env: INSTANCE=default-ubuntu-2004-tiamat-py3
# - env: INSTANCE=default-ubuntu-1804-tiamat-py3
# - env: INSTANCE=default-centos-stream8-tiamat-py3
Expand All @@ -109,13 +110,13 @@ jobs:
- env: INSTANCE=default-debian-11-master-py3
- env: INSTANCE=default-debian-10-master-py3
- env: INSTANCE=default-debian-9-master-py3
- env: INSTANCE=default-ubuntu-2204-master-py3
- env: INSTANCE=default-ubuntu-2004-master-py3
- env: INSTANCE=default-ubuntu-1804-master-py3
- env: INSTANCE=default-centos-stream8-master-py3
- env: INSTANCE=default-centos-7-master-py3
- env: INSTANCE=default-fedora-36-master-py3
- env: INSTANCE=default-fedora-35-master-py3
- env: INSTANCE=default-fedora-34-master-py3
- env: INSTANCE=default-opensuse-leap-153-master-py3
- env: INSTANCE=default-opensuse-tmbl-latest-master-py3
- env: INSTANCE=default-amazonlinux-2-master-py3
Expand All @@ -129,13 +130,13 @@ jobs:
# - env: INSTANCE=default-debian-11-3004-1-py3
# - env: INSTANCE=default-debian-10-3004-1-py3
# - env: INSTANCE=default-debian-9-3004-1-py3
# - env: INSTANCE=default-ubuntu-2204-3004-1-py3
# - env: INSTANCE=default-ubuntu-2004-3004-1-py3
# - env: INSTANCE=default-ubuntu-1804-3004-1-py3
# - env: INSTANCE=default-centos-stream8-3004-1-py3
# - env: INSTANCE=default-centos-7-3004-1-py3
# - env: INSTANCE=default-fedora-36-3004-1-py3
# - env: INSTANCE=default-fedora-35-3004-1-py3
# - env: INSTANCE=default-fedora-34-3004-1-py3
# - env: INSTANCE=default-amazonlinux-2-3004-1-py3
# - env: INSTANCE=default-oraclelinux-8-3004-1-py3
# - env: INSTANCE=default-oraclelinux-7-3004-1-py3
Expand All @@ -156,14 +157,6 @@ jobs:
# - env: INSTANCE=default-oraclelinux-8-3003-4-py3
# - env: INSTANCE=default-oraclelinux-7-3003-4-py3
# - env: INSTANCE=default-almalinux-8-3003-4-py3
# - env: INSTANCE=default-debian-10-3002-8-py3
# - env: INSTANCE=default-debian-9-3002-8-py3
# - env: INSTANCE=default-ubuntu-2004-3002-8-py3
# - env: INSTANCE=default-ubuntu-1804-3002-8-py3
# - env: INSTANCE=default-centos-7-3002-8-py3
# - env: INSTANCE=default-amazonlinux-2-3002-8-py3
# - env: INSTANCE=default-oraclelinux-8-3002-8-py3
# - env: INSTANCE=default-oraclelinux-7-3002-8-py3

## Define the release stage that runs `semantic-release`
- stage: 'release'
Expand Down
2 changes: 1 addition & 1 deletion {= cookiecutter.abbr =}-formula/Gemfile
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# frozen_string_literal: true

source ENV['PROXY_RUBYGEMSORG'] || 'https://rubygems.org'
source ENV.fetch('PROXY_RUBYGEMSORG', 'https://rubygems.org')

# Install the `inspec` gem using `git` because versions after `4.22.22`
# suppress diff output; this version fixes this for our uses.
Expand Down
Loading

0 comments on commit 9ca3506

Please sign in to comment.