Skip to content
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

add branch selection in release form #1956

Closed
wants to merge 4 commits into from
Closed
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
5 changes: 5 additions & 0 deletions .github/workflows/build-userguide.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@ on:
run-tests:
required: true
type: string
target_branch:
required: true
type: string

env:
IS_RELEASE: ${{ github.event_name == 'workflow_dispatch' }}
Expand All @@ -25,6 +28,8 @@ jobs:

steps:
- uses: actions/checkout@v3
with:
ref: ${{ inputs.target_branch}}

- name: Set up Python
uses: actions/setup-python@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/centos7.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:

- name: Checkout
run: |
git clone $GITHUB_SERVER_URL/$GITHUB_REPOSITORY.git -b $GITHUB_REF_NAME .
git clone $GITHUB_SERVER_URL/$GITHUB_REPOSITORY.git -b ${{ github.event.inputs.target_branch }} .

- name: Install gcc 10
run: |
Expand Down
11 changes: 10 additions & 1 deletion .github/workflows/new_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@ name: Create new release
on:
workflow_dispatch:
inputs:
target_branch:
description: "Target branch or full commit SHA (default develop)"
default: "develop"
release_tag:
description: "Release tag"
required: true
Expand All @@ -24,11 +27,13 @@ jobs:
tag: ${{ github.event.inputs.release_tag }}
title: ${{ github.event.inputs.release_name }}
tests: ${{ github.event.inputs.run-tests }}
target_branch: ${{ github.event.inputs.target_branch }}
run: |
gh release create "$tag" \
--repo="$GITHUB_REPOSITORY" \
--title="$title" \
--notes="Run tests: $tests"
--notes="Run tests: $tests"\
--target="$target_branch"



Expand All @@ -38,13 +43,15 @@ jobs:
uses: ./.github/workflows/ubuntu.yml
with:
run-tests: ${{ inputs.run-tests }}
target_branch: ${{ inputs.target_branch }}

windows:
name: Release - Windows
needs: release
uses: ./.github/workflows/windows-vcpkg.yml
with:
run-tests: ${{ inputs.run-tests }}
target_branch: ${{ inputs.target_branch }}

centos7:
name: Release - centos7
Expand All @@ -59,10 +66,12 @@ jobs:
uses: ./.github/workflows/oracle8.yml
with:
run-tests: ${{ inputs.run-tests }}


user_guide:
name: User Guide
needs: release
uses: ./.github/workflows/build-userguide.yml
with:
run-tests: ${{ inputs.run-tests }}
target_branch: ${{ inputs.target_branch }}
2 changes: 1 addition & 1 deletion .github/workflows/oracle8.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:

- name: Checkout
run: |
git clone $GITHUB_SERVER_URL/$GITHUB_REPOSITORY.git -b $GITHUB_REF_NAME .
git clone $GITHUB_SERVER_URL/$GITHUB_REPOSITORY.git -b ${{ github.event.inputs.target_branch }} .

- name: Config OR-Tools URL
run: |
Expand Down
8 changes: 7 additions & 1 deletion .github/workflows/ubuntu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,16 @@ on:
run-tests:
required: true
type: string
target_branch:
required: true
type: string

env:
GITHUB_TOKEN: ${{ github.token }}
IS_RELEASE: ${{ github.event_name == 'workflow_dispatch' }}
RUN_SIMPLE_TESTS: ${{ github.event_name == 'push' || inputs.run-tests == 'true' }}
RUN_EXTENDED_TESTS: ${{ github.event_name == 'schedule' || inputs.run-tests == 'true' }}
REF: ${{ inputs.target_branch =='' && github.ref || inputs.target_branch}}

jobs:

Expand All @@ -37,7 +41,9 @@ jobs:

steps:
- uses: actions/checkout@v3

with:
ref: ${{ env.REF }}

- name: ccache
uses: hendrikmuhs/[email protected]
with:
Expand Down
7 changes: 7 additions & 0 deletions .github/workflows/windows-vcpkg.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,16 @@ on:
run-tests:
required: true
type: string
target_branch:
required: true
type: string

env:
GITHUB_TOKEN: ${{ github.token }}
IS_RELEASE: ${{ github.event_name == 'workflow_dispatch' }}
RUN_SIMPLE_TESTS: ${{ github.event_name == 'push' || inputs.run-tests == 'true' }}
RUN_EXTENDED_TESTS: ${{ github.event_name == 'schedule' || inputs.run-tests == 'true' }}
REF: ${{ inputs.target_branch =='' && github.ref || inputs.target_branch}}


jobs:
Expand All @@ -40,7 +44,10 @@ jobs:
runs-on: windows-latest

steps:

- uses: actions/checkout@v3
with:
ref: ${{ env.REF }}

- name: Config OR-Tools URL
run: |
Expand Down
Loading