Skip to content
Snippets Groups Projects
Commit 2e1d4abf authored by Hugo Trentesaux's avatar Hugo Trentesaux
Browse files

Merge branch 'hugo-revert' into 'master' 

revert benchmark removal in CI

See merge request !211
parents a7c628ba 8cd073e7
No related branches found
No related tags found
1 merge request!211revert benchmark removal in CI
Pipeline #34686 passed
Stage: build
    Stage: tests
      Hide whitespace changes
      Inline Side-by-side
      Showing
      with 29 additions and 29 deletions
      .gitlab-ci.yml
      + 29
      − 29
      View file @ 2e1d4abf
      ...@@ -14,14 +14,14 @@ stages: ...@@ -14,14 +14,14 @@ stages:
      workflow: workflow:
      rules: rules:
      - changes: - changes:
      - docker/Dockerfile - docker/Dockerfile
      - end2end-tests/**/* - end2end-tests/**/*
      - node/**/* - node/**/*
      - pallets/**/* - pallets/**/*
      - runtime/**/* - runtime/**/*
      - .gitlab-ci.yml - .gitlab-ci.yml
      - Cargo.toml - Cargo.toml
      - Cargo.lock - Cargo.lock
      sanity_tests: sanity_tests:
      extends: .env extends: .env
      ...@@ -65,24 +65,24 @@ fmt_and_clippy: ...@@ -65,24 +65,24 @@ fmt_and_clippy:
      - cargo clippy -- -V - cargo clippy -- -V
      - cargo clippy --all --tests -- -D warnings - cargo clippy --all --tests -- -D warnings
      #run_benchmarks: run_benchmarks:
      # stage: tests stage: tests
      # script: script:
      # - echo podman build --layers --tag "$IMAGE_NAME:$IMAGE_TAG" -f docker/Dockerfile $PODMAN_BUILD_OPTIONS . - echo podman build --layers --tag "$IMAGE_NAME:$IMAGE_TAG" -f docker/Dockerfile $PODMAN_BUILD_OPTIONS .
      # - podman build --layers --tag "$IMAGE_NAME:$IMAGE_TAG" -f docker/Dockerfile $PODMAN_BUILD_OPTIONS . - podman build --layers --tag "$IMAGE_NAME:$IMAGE_TAG" -f docker/Dockerfile $PODMAN_BUILD_OPTIONS .
      # rules: rules:
      # - if: $CI_COMMIT_REF_NAME =~ /^wip*$/ - if: $CI_COMMIT_REF_NAME =~ /^wip*$/
      # when: manual when: manual
      # - if: $CI_COMMIT_TAG - if: $CI_COMMIT_TAG
      # when: never when: never
      # - if: '$CI_MERGE_REQUEST_ID || $CI_COMMIT_BRANCH == "master"' - if: '$CI_MERGE_REQUEST_ID || $CI_COMMIT_BRANCH == "master"'
      # - when: manual - when: manual
      # variables: variables:
      # IMAGE_NAME: "duniter/duniter-v2s-test" IMAGE_NAME: "duniter/duniter-v2s-test"
      # IMAGE_TAG: "debug-sha-$CI_COMMIT_SHORT_SHA" IMAGE_TAG: "debug-sha-$CI_COMMIT_SHORT_SHA"
      # PODMAN_BUILD_OPTIONS: "--target build --build-arg benchmarks=1" PODMAN_BUILD_OPTIONS: "--target build --build-arg benchmarks=1"
      # tags: tags:
      # - podman - podman
      gdev_build: gdev_build:
      stage: build stage: build
      ...@@ -130,8 +130,8 @@ tests: ...@@ -130,8 +130,8 @@ tests:
      rules: rules:
      - if: $CI_PIPELINE_SOURCE != "merge_request_event" && $CI_COMMIT_BRANCH =~ /^(release\/runtime-)[0-9].*/ - if: $CI_PIPELINE_SOURCE != "merge_request_event" && $CI_COMMIT_BRANCH =~ /^(release\/runtime-)[0-9].*/
      when: manual when: manual
      # changes: # changes:
      # - node/specs/$CHAIN-raw.json # - node/specs/$CHAIN-raw.json
      - when: never - when: never
      before_script: before_script:
      - sh -c "[ -n '$DUNITERTEAM_PASSWD' ] || ( echo No access to environment variable 'DUNITERTEAM_PASSWD'; exit 1 )" - sh -c "[ -n '$DUNITERTEAM_PASSWD' ] || ( echo No access to environment variable 'DUNITERTEAM_PASSWD'; exit 1 )"
      ...@@ -312,7 +312,7 @@ create_release: ...@@ -312,7 +312,7 @@ create_release:
      stage: release stage: release
      rules: rules:
      - if: $CI_PIPELINE_SOURCE != "merge_request_event" && $CI_COMMIT_BRANCH =~ /^(release\/runtime-)[0-9].*/ - if: $CI_PIPELINE_SOURCE != "merge_request_event" && $CI_COMMIT_BRANCH =~ /^(release\/runtime-)[0-9].*/
      needs: ['create_g1_data', 'gdev_srtool', 'gtest_srtool'] needs: ["create_g1_data", "gdev_srtool", "gtest_srtool"]
      when: manual when: manual
      image: rust:1-bullseye image: rust:1-bullseye
      variables: variables:
      ......
      0% or .
      You are about to add 0 people to the discussion. Proceed with caution.
      Finish editing this message first!
      Please register or to comment