Commit f6f793ec authored by Ruben ten Hove's avatar Ruben ten Hove Committed by Federico Falconieri
Browse files

feat: consolidated changes

parent f912a641

.gitlab-ci.yml

+2 −4
Original line number Diff line number Diff line
@@ -3,6 +3,8 @@ 


variables:

  SCHEDULE_PIPELINE_PROJECT_IDS: 30771297 30771293 30771284 30771254 30771239

  GITLAB_RECOMMENDED_AUTO_FIX: "true"

  RELEASE_CHANGELOG: "false"



include:

  - local: pipelines/project-automation.yml
@@ -11,10 +13,6 @@ include: 
  - local: project-automation/pages-hugo.yml

  - local: docs/prettier.yml



gitlab:recommended:

  variables:

    GITLAB_RECOMMENDED_AUTO_FIX: "true"



pages:

  stage: test

  before_script:

.releaserc

deleted100644 → 0
+0 −24
Original line number Diff line number Diff line 
{

  "plugins": [

    "@semantic-release/commit-analyzer",

    "@semantic-release/release-notes-generator",

    "@semantic-release/gitlab",

    ["@semantic-release/git", {

      "assets": ["README.md", "tbump.toml", "pipelines/container.md", "python/*.yml"]

    }]

  ],

  "branches": [

    "+([0-9])?(.{+([0-9]),x}).x",

    "main",

    "next",

    "next-major",

    {

      "name": "beta",

      "prerelease": true

    },

    {

      "name": "alpha",

      "prerelease": true

    }

  ]

}

README.md

+3 −3
Original line number Diff line number Diff line 
# Just CI templates v6.0.1

# Just CI templates v6.1.0-beta.4



Maintainers:
@@ -81,7 +81,7 @@ is an example `.gitlab-ci.yml` importing the python template: 
include:

  - project: just-ci/templates

    file: templates/python.yml

    ref: v6.0.1

    ref: v6.1.0-beta.4

```



The above is a template for Python projects. Other templates can be found in
@@ -102,7 +102,7 @@ you want you can always disable specific jobs with custom rules. 
include:

  - project: just-ci/templates

    file: templates/python.yml

    ref: v6.0.1

    ref: v6.1.0-beta.4



python:pytest:

  rules:

container/buildah.yml

+1 −5
Original line number Diff line number Diff line
@@ -19,11 +19,7 @@ variables: 
    - echo "{\"auths\":{\"$CI_REGISTRY\":{\"auth\":\"$(echo -n

      ${CI_REGISTRY_USER}:${CI_REGISTRY_PASSWORD} | base64)\"}}}" >

      /tmp/auth.json

    - |

      if [ "${IMAGE_CONTAINERFILE}" != "" ]; then

        CONTAINERFILE_ARG="-f ${IMAGE_CONTAINERFILE}"

      fi

    - buildah build --authfile /tmp/auth.json ${CONTAINERFILE_ARG}

    - buildah build --authfile /tmp/auth.json -f ${IMAGE_CONTAINERFILE}

      --tag=${IMAGE_NAME}:${IMAGE_DEV_TAG} --tag=${IMAGE_NAME}:${IMAGE_TAG}

      --layers=${IMAGE_CACHE} ${BUILDAH_EXTRA_ARGS} ${IMAGE_CONTEXT}

    - |

container/grype.yml

+2 −0
Original line number Diff line number Diff line
@@ -36,6 +36,8 @@ variables: 
      - grype.txt

    when: always

  allow_failure: true

  needs:

    - image:build



grype:

  extends: .grype