Skip to content

merge queue: embarking main (338a06c) and #1612 together #1615

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
mergify wants to merge 2 commits into from
Closed

merge queue: embarking main (338a06c) and #1612 together #1615

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
53567df
ci(common): use latest images in mergify e2e tests
eudelins-zama Dec 19, 2025
bf6b430
Merge of #1612
mergify[bot] Dec 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions .github/workflows/test-suite-orchestrate-e2e-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,8 @@ jobs:
- test-suite-docker-build
if: ${{ success() || failure() }}
env:
COMMIT_HASH: ${{ github.event.pull_request.head.sha || github.sha }}
PREVIOUS_COMMIT_HASH: ${{ github.event.pull_request.base.sha }}
NEW_COMMIT_HASH: ${{ github.event.pull_request.head.sha }}
DOCKER_BUILD_RESULTS: ${{ toJSON(needs) }}
runs-on: ubuntu-latest
outputs:
Expand All @@ -73,13 +74,15 @@ jobs:
uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v0.8.0
with:
script: |
const commitHash = process.env.COMMIT_HASH;
console.log(`Commit hash: ${commitHash}`)
const previousCommitHash = process.env.PREVIOUS_COMMIT_HASH;
const newCommitHash = process.env.NEW_COMMIT_HASH;
console.log(`Previous commit hash: ${previousCommitHash}`)
console.log(`New commit hash: ${newCommitHash}`)
console.log(`Docker build results: ${process.env.DOCKER_BUILD_RESULTS}`)

const dockerBuildResults = JSON.parse(process.env.DOCKER_BUILD_RESULTS);
function getImageTagIfBuilt(key, build_result) {
let imageTag = dockerBuildResults[key].outputs[build_result] === 'success' ? commitHash : '';
let imageTag = dockerBuildResults[key].outputs[build_result] === 'success' ? newCommitHash : previousCommitHash;
console.log(`Assigning image tag '${imageTag}' for ${key}`);
return imageTag;
}
Expand Down
Loading