mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2026-05-17 00:06:35 +00:00
ce27a5993c
https://codeberg.org/forgejo/forgejo/pulls/11750 missed a place where the attempt number is incremented independently. This caused the job view to break when running a reusable workflow with workflow expansion. ## Checklist The [contributor guide](https://forgejo.org/docs/next/contributor/) contains information that will be helpful to first time contributors. All work and communication must conform to Forgejo's [AI Agreement](https://codeberg.org/forgejo/governance/src/branch/main/AIAgreement.md). There also are a few [conditions for merging Pull Requests in Forgejo repositories](https://codeberg.org/forgejo/governance/src/branch/main/PullRequestsAgreement.md). You are also welcome to join the [Forgejo development chatroom](https://matrix.to/#/#forgejo-development:matrix.org). ### Tests for Go changes (can be removed for JavaScript changes) - I added test coverage for Go changes... - [ ] in their respective `*_test.go` for unit tests. - [x] in the `tests/integration` directory if it involves interactions with a live Forgejo server. - I ran... - [x] `make pr-go` before pushing ### Tests for JavaScript changes (can be removed for Go changes) - I added test coverage for JavaScript changes... - [ ] in `web_src/js/*.test.js` if it can be unit tested. - [ ] in `tests/e2e/*.test.e2e.js` if it requires interactions with a live Forgejo server (see also the [developer guide for JavaScript testing](https://codeberg.org/forgejo/forgejo/src/branch/forgejo/tests/e2e/README.md#end-to-end-tests)). ### Documentation - [ ] I created a pull request [to the documentation](https://codeberg.org/forgejo/docs) to explain to Forgejo users how to use this change. - [x] I did not document these changes and I do not expect someone else to do it. ### Release notes - [ ] This change will be noticed by a Forgejo user or admin (feature, bug fix, performance, etc.). I suggest to include a release note for this change. - [x] This change is not visible to a Forgejo user or admin (refactor, dependency upgrade, etc.). I think there is no need to add a release note for this change. *The decision if the pull request will be shown in the release notes is up to the mergers / release team.* The content of the `release-notes/<pull request number>.md` file will serve as the basis for the release notes. If the file does not exist, the title of the pull request will be used instead. Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/11956 Reviewed-by: Mathieu Fenniak <mfenniak@noreply.codeberg.org> Co-authored-by: Andreas Ahlenstorf <andreas@ahlenstorf.ch> Co-committed-by: Andreas Ahlenstorf <andreas@ahlenstorf.ch>
90 lines
2.7 KiB
YAML
90 lines
2.7 KiB
YAML
# Case 600 -- workflow that is not a workflow call outer job
|
|
-
|
|
id: 600
|
|
attempt: 1
|
|
status: 1 # success
|
|
started: 1683636528
|
|
workflow_payload: |
|
|
"on":
|
|
push:
|
|
jobs:
|
|
produce-artifacts:
|
|
name: produce-artifacts
|
|
runs-on: docker
|
|
steps:
|
|
- run: echo "OK!"
|
|
|
|
# Case w/ action_run_job.id = 601 -- workflow call outer job exercising every available context in the `outputs`. Note
|
|
# that jobparser translates `on.workflow_call.outputs` into the outer job's `job.<job_id>.outputs`, so the available
|
|
# contexts should be considered as those in `on.workflow_call.outputs`.
|
|
-
|
|
id: 601
|
|
attempt: 1
|
|
run_id: 900
|
|
status: 1 # success
|
|
started: 1683636528
|
|
needs: ["outer-job.inner-job"]
|
|
workflow_payload: |
|
|
"on":
|
|
push:
|
|
jobs:
|
|
outer-job:
|
|
name: outer-job
|
|
if: false
|
|
uses: ./.forgjeo/workflows/reusable.yml
|
|
outputs:
|
|
from_inner_job: ${{ needs['outer-job.inner-job'].outputs.my_output }}
|
|
from_inner_job_result: ${{ needs['outer-job.inner-job'].result }}
|
|
from_forgejo_ctx: ${{ forgejo.ref }}
|
|
from_input_ctx: ${{ inputs.wc_input }}!
|
|
from_vars_repo: ${{ vars.repo_var }}
|
|
from_vars_org: ${{ vars.org_var }}
|
|
from_vars_global: ${{ vars.global_var }}
|
|
__metadata:
|
|
workflow_call_inputs:
|
|
wc_input: 'hello, world'
|
|
workflow_call_id: b5a9f46f1f2513d7777fde50b169d323a6519e349cc175484c947ac315a209ed
|
|
- # inner job of run 601
|
|
id: 602
|
|
attempt: 1
|
|
run_id: 900
|
|
status: 1 # success
|
|
job_id: outer-job.inner-job
|
|
task_id: 100
|
|
|
|
# Case w/ action_run_job.id = 603 -- functionality of this is a duplicate of case 601 but it has already been executed
|
|
# (attempt = 1) and we're testing that the updated outputs from the rerun are stored.
|
|
-
|
|
id: 603
|
|
run_id: 901
|
|
attempt: 2
|
|
status: 1 # success
|
|
started: 1683636528
|
|
needs: ["outer-job.inner-job"]
|
|
workflow_payload: |
|
|
"on":
|
|
push:
|
|
jobs:
|
|
outer-job:
|
|
name: outer-job
|
|
if: false
|
|
uses: ./.forgjeo/workflows/reusable.yml
|
|
outputs:
|
|
from_inner_job: ${{ needs['outer-job.inner-job'].outputs.my_output }}
|
|
from_inner_job_result: ${{ needs['outer-job.inner-job'].result }}
|
|
from_forgejo_ctx: ${{ forgejo.ref }}
|
|
from_input_ctx: ${{ inputs.wc_input }}!
|
|
from_vars_repo: ${{ vars.repo_var }}
|
|
from_vars_org: ${{ vars.org_var }}
|
|
from_vars_global: ${{ vars.global_var }}
|
|
__metadata:
|
|
workflow_call_inputs:
|
|
wc_input: 'hello, world'
|
|
workflow_call_id: b5a9f46f1f2513d7777fde50b169d323a6519e349cc175484c947ac315a209ed
|
|
- # inner job of run 603
|
|
id: 604
|
|
run_id: 901
|
|
attempt: 2
|
|
status: 1 # success
|
|
job_id: outer-job.inner-job
|
|
task_id: 101
|