From 2b4b938c72141f12109b963f3af54e41f5d9ee8f Mon Sep 17 00:00:00 2001 From: Marten Lohstroh Date: Thu, 14 Sep 2023 18:20:34 -0700 Subject: [PATCH 1/4] Allow building against lingua-franca fork --- .github/workflows/build.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8ea91e0..e66e3cd 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -14,6 +14,9 @@ on: lingua-franca-ref: type: string required: false + lingua-franca-repo: + type: string + required: false secrets: gpg-passphrase: required: false @@ -45,6 +48,12 @@ jobs: - name: Check Maven/Java configuration run: mvn -version shell: bash + - name: Point submodule to given repo + run: | + git submodule set-url -- org.lflang/lingua-franca https://github.com/${{ inputs.lingua-franca-repo }} + git submodule update --init --recursive + shell: bash + if: ${{ inputs.lingua-franca-repo != '' }} - name: Update `lingua-franca` submodule run: | cd org.lflang/lingua-franca From d054c087dea3ca6889d54b13521ae5c14b00aadd Mon Sep 17 00:00:00 2001 From: Marten Lohstroh Date: Thu, 14 Sep 2023 18:31:58 -0700 Subject: [PATCH 2/4] Update submodules recursively --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e66e3cd..9ce4164 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -60,7 +60,7 @@ jobs: git fetch --all git checkout ${{ inputs.lingua-franca-ref }} git pull - git submodule update + git submodule update --recursive shell: bash if: ${{ inputs.lingua-franca-ref != '' }} - name: Configure Git for francabot From 09d1a5fdcf0d2d45d11f641296c99d4bd216a09e Mon Sep 17 00:00:00 2001 From: Marten Lohstroh Date: Thu, 14 Sep 2023 19:51:05 -0700 Subject: [PATCH 3/4] Add descriptions to inputs --- .github/workflows/build.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9ce4164..c3c4c35 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -4,18 +4,22 @@ on: workflow_call: inputs: nightly: - required: false type: boolean + description: Whether this is a nightly build + required: false default: false upload-artifacts: type: boolean + description: Whether to upload build artifacts required: false default: true lingua-franca-ref: type: string + description: Ref of the lingua-franca submodule to check out required: false lingua-franca-repo: type: string + description: Full repository name of the form / required: false secrets: gpg-passphrase: From 283e838a3bfa6387ced42f0b1c6128de83a1410a Mon Sep 17 00:00:00 2001 From: Marten Lohstroh Date: Thu, 14 Sep 2023 19:54:31 -0700 Subject: [PATCH 4/4] Add epoch-ref input --- .github/workflows/build.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c3c4c35..7da3d0d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -13,6 +13,11 @@ on: description: Whether to upload build artifacts required: false default: true + epoch-ref: + type: string + description: Ref of the epoch repository to check out + required: false + default: main lingua-franca-ref: type: string description: Ref of the lingua-franca submodule to check out @@ -43,6 +48,7 @@ jobs: uses: actions/checkout@v3 with: repository: lf-lang/epoch + ref: ${{ inputs.epoch-ref }} submodules: recursive fetch-depth: 0 - uses: actions/setup-java@v3