Commit 000dbcab authored by Jan Kiene's avatar Jan Kiene
Browse files

also use dotenv mechanism and print commits in jobs

parent 83331711

main-basop.yml

+10 −0
Original line number Diff line number Diff line
@@ -381,6 +381,14 @@ workflow: 
    - if [ "$DISABLE_HRTF" = "true" ]; then

    -   export PYTEST_ADDOPTS="${PYTEST_ADDOPTS} -k 'not model'"

    - fi

    - echo "Commits from Pre job from file:"

    - cat $MERGE_TARGET_COMMIT_FILE

    - cat $FLOAT_REF_COMMIT_FILE

    - cat $MERGE_SOURCE_FLOAT_REF_COMMIT_FILE

    - echo "Commits from Pre job from env vars:"

    - echo "MERGE_TARGET_COMMIT=$MERGE_TARGET_COMMIT"

    - echo "MERGE_SOURCE_FLOAT_REF_COMMIT=$MERGE_SOURCE_FLOAT_REF_COMMIT"

    - echo "FLOAT_REF_COMMIT=$FLOAT_REF_COMMIT"

  variables:

    USE_LTV: 0
@@ -856,6 +864,8 @@ branch-is-up-to-date-with-target-pre: 
      - $MERGE_TARGET_COMMIT_FILE

      - $FLOAT_REF_COMMIT_FILE

      - $MERGE_SOURCE_FLOAT_REF_COMMIT_FILE

    reports:

      dotenv: commits.env



branch-is-up-to-date-with-target-post:

  extends:

snippets/basop/branch-is-up-to-date-with-target-pre.sh

+5 −0
Original line number Diff line number Diff line
@@ -53,3 +53,8 @@ echo "$MERGE_SOURCE_FLOAT_REF_COMMIT" >"$MERGE_SOURCE_FLOAT_REF_COMMIT_FILE" 
FLOAT_REF_COMMIT="$(git rev-parse "origin/ivas-float-update")"

echo "FLOAT_REF_COMMIT is $FLOAT_REF_COMMIT"

echo "$FLOAT_REF_COMMIT" >"$FLOAT_REF_COMMIT_FILE"



# create commits.env file for passing the variables to other jobs

echo "MERGE_TARGET_COMMIT=$MERGE_TARGET_COMMIT" >>commits.env

echo "MERGE_SOURCE_FLOAT_REF_COMMIT=$MERGE_SOURCE_FLOAT_REF_COMMIT" >>commits.env

echo "FLOAT_REF_COMMIT=$FLOAT_REF_COMMIT" >>commits.env