Skip to content

ci: make commit sha consistent across workflows #680

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.

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

Merged
merged 1 commit into from
Jan 12, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 8 additions & 4 deletions .github/workflows/basic-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@ name: Essential Test

on: workflow_call

env:
COMMIT_SHA: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}

jobs:
lint:
runs-on: ubuntu-latest
Expand All @@ -18,7 +21,7 @@ jobs:
- name: Archive lint report results
uses: actions/upload-artifact@v4
with:
name: lint-report-${{ github.sha }}
name: lint-report-${{ env.COMMIT_SHA }}
path: reports

build:
Expand All @@ -32,13 +35,14 @@ jobs:
- name: Archive build result
uses: actions/upload-artifact@v4
with:
name: library-dist-${{ github.sha }}
name: library-dist-${{ env.COMMIT_SHA }}
path: dist

unit-test:
strategy:
matrix:
os: [ubuntu-latest, windows-latest]
os: [ubuntu-latest] # to have test faster
# os: [ubuntu-latest, windows-latest]
node-version: [20, 22]
runs-on: ${{ matrix.os }}
steps:
Expand All @@ -61,5 +65,5 @@ jobs:
name: Archive coverage report
uses: actions/upload-artifact@v4
with:
name: ngx-deploy-npm-coverage-report-${{ github.sha }}
name: ngx-deploy-npm-coverage-report-${{ env.COMMIT_SHA }}
path: coverage/packages/ngx-deploy-npm/lcov.info
57 changes: 52 additions & 5 deletions .github/workflows/sonar-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,59 @@ jobs:
JSON.stringify(${{ github.event.workflow_run }}, null, 2)

# Download reports
- uses: ./.github/actions/download-coverage-report
with:
sha: ${{ github.event.workflow_run.head_sha }}
- uses: ./.github/actions/download-lint-report
- name: 'Download reports'
uses: actions/github-script@v6
with:
sha: ${{ github.event.workflow_run.head_sha }}
script: |
async function downloadArtifact(artifactName) {
console.log(`Looking for artifact: ${artifactName}`);

let allArtifacts = await github.rest.actions.listWorkflowRunArtifacts({
owner: context.repo.owner,
repo: context.repo.repo,
run_id: context.payload.workflow_run.id,
});

console.log('Available artifacts:', allArtifacts.data.artifacts.map(a => a.name));

let matchArtifact = allArtifacts.data.artifacts.find((artifact) => {
return artifact.name === artifactName;
});

if (!matchArtifact) {
throw new Error(`Artifact "${artifactName}" not found!`);
}

let download = await github.rest.actions.downloadArtifact({
owner: context.repo.owner,
repo: context.repo.repo,
artifact_id: matchArtifact.id,
archive_format: 'zip',
});

let fs = require('fs');
fs.writeFileSync(`${process.env.GITHUB_WORKSPACE}/${artifactName}.zip`, Buffer.from(download.data));

return artifactName;
}

const sha = context.payload.workflow_run.head_sha;

// Download both artifacts
await Promise.all([
downloadArtifact(`ngx-deploy-npm-coverage-report-${sha}`),
downloadArtifact(`lint-report-${sha}`)
]);

- name: 'Extract reports'
run: |
# Extract coverage report
mkdir -p coverage/packages/ngx-deploy-npm
unzip ngx-deploy-npm-coverage-report-*.zip -d coverage/packages/ngx-deploy-npm

# Extract lint report
mkdir -p reports
unzip lint-report-*.zip -d reports

- name: SonarCloud Scan
uses: sonarsource/sonarcloud-github-action@master
Expand Down
Loading