From 4f4753882642d4eb9c202f64ce84aee1f6b405fa Mon Sep 17 00:00:00 2001 From: Nick Evans <2616208+nickevansuk@users.noreply.github.com> Date: Tue, 25 Feb 2025 13:41:24 +0000 Subject: [PATCH 1/5] chore: Testable build --- .github/workflows/generate-models.yaml | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/.github/workflows/generate-models.yaml b/.github/workflows/generate-models.yaml index aa15c77..74c7fbd 100644 --- a/.github/workflows/generate-models.yaml +++ b/.github/workflows/generate-models.yaml @@ -13,7 +13,15 @@ jobs: strategy: matrix: - language: ['.NET', 'PHP', 'Ruby', 'TypeScript'] + language: + - language: '.NET' + repo: OpenActive.NET + - language: 'PHP' + repo: models-php + - language: 'Ruby' + repo: models-ruby + - language: 'TypeScript' + repo: models-ts steps: - name: Checkout @@ -37,3 +45,7 @@ jobs: run: npm start -- generate ${{ matrix.language }} --destination ../output/ working-directory: models-lib + - name: Test model build + uses: openactive/models-ts/.github/workflows/create-data-model-pr.yaml@ci/testable-build + with: + models-lib_ref: ${{ github.ref }} From 4f6acfcff24b16cbe002dbc898695503fda6d455 Mon Sep 17 00:00:00 2001 From: Nick Evans <2616208+nickevansuk@users.noreply.github.com> Date: Tue, 25 Feb 2025 15:55:16 +0000 Subject: [PATCH 2/5] Update generate-models.yaml --- .github/workflows/generate-models.yaml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/generate-models.yaml b/.github/workflows/generate-models.yaml index 74c7fbd..f6c865a 100644 --- a/.github/workflows/generate-models.yaml +++ b/.github/workflows/generate-models.yaml @@ -14,14 +14,14 @@ jobs: strategy: matrix: language: - - language: '.NET' - repo: OpenActive.NET - - language: 'PHP' - repo: models-php - - language: 'Ruby' - repo: models-ruby - - language: 'TypeScript' - repo: models-ts + - name: '.NET' + repo: 'OpenActive.NET' + - name: 'PHP' + repo: 'models-php' + - name: 'Ruby' + repo: 'models-ruby' + - name: 'TypeScript' + repo: 'models-ts' steps: - name: Checkout @@ -41,11 +41,11 @@ jobs: run: npm update @openactive/data-models working-directory: models-lib - - name: Generate ${{ matrix.language }} models - run: npm start -- generate ${{ matrix.language }} --destination ../output/ + - name: Generate ${{ matrix.language.name }} models + run: npm start -- generate ${{ matrix.language.name }} --destination ../output/ working-directory: models-lib - name: Test model build - uses: openactive/models-ts/.github/workflows/create-data-model-pr.yaml@ci/testable-build + uses: openactive/${{ matrix.language.repo }}/.github/workflows/create-data-model-pr.yaml@ci/testable-build with: models-lib_ref: ${{ github.ref }} From d865bf297d5c913b4651528d66fd012c237aa0ce Mon Sep 17 00:00:00 2001 From: Nick Evans <2616208+nickevansuk@users.noreply.github.com> Date: Tue, 25 Feb 2025 16:00:44 +0000 Subject: [PATCH 3/5] Update generate-models.yaml --- .github/workflows/generate-models.yaml | 27 +++++++++++--------------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/.github/workflows/generate-models.yaml b/.github/workflows/generate-models.yaml index f6c865a..eed898a 100644 --- a/.github/workflows/generate-models.yaml +++ b/.github/workflows/generate-models.yaml @@ -8,20 +8,11 @@ on: jobs: generate: - runs-on: ubuntu-latest strategy: matrix: - language: - - name: '.NET' - repo: 'OpenActive.NET' - - name: 'PHP' - repo: 'models-php' - - name: 'Ruby' - repo: 'models-ruby' - - name: 'TypeScript' - repo: 'models-ts' + language: ['.NET', 'PHP', 'Ruby', 'TypeScript'] steps: - name: Checkout @@ -41,11 +32,15 @@ jobs: run: npm update @openactive/data-models working-directory: models-lib - - name: Generate ${{ matrix.language.name }} models - run: npm start -- generate ${{ matrix.language.name }} --destination ../output/ + - name: Generate ${{ matrix.language }} models + run: npm start -- generate ${{ matrix.language }} --destination ../output/ working-directory: models-lib - - name: Test model build - uses: openactive/${{ matrix.language.repo }}/.github/workflows/create-data-model-pr.yaml@ci/testable-build - with: - models-lib_ref: ${{ github.ref }} + test: + strategy: + matrix: + repos: ['OpenActive.NET', 'models-php', 'models-ruby', 'models-ts'] + + uses: openactive/${{ matrix.repo }}/.github/workflows/create-data-model-pr.yaml@ci/testable-build + with: + models-lib_ref: ${{ github.ref }} From 0dfce9ee9ee126f4ab2c155d66c81afaebc5373a Mon Sep 17 00:00:00 2001 From: Nick Evans <2616208+nickevansuk@users.noreply.github.com> Date: Tue, 25 Feb 2025 16:03:55 +0000 Subject: [PATCH 4/5] Update generate-models.yaml --- .github/workflows/generate-models.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/generate-models.yaml b/.github/workflows/generate-models.yaml index eed898a..b79ce4f 100644 --- a/.github/workflows/generate-models.yaml +++ b/.github/workflows/generate-models.yaml @@ -39,7 +39,7 @@ jobs: test: strategy: matrix: - repos: ['OpenActive.NET', 'models-php', 'models-ruby', 'models-ts'] + repo: ['OpenActive.NET', 'models-php', 'models-ruby', 'models-ts'] uses: openactive/${{ matrix.repo }}/.github/workflows/create-data-model-pr.yaml@ci/testable-build with: From f0397fbca51d997528c87d7ed7a900737c90742b Mon Sep 17 00:00:00 2001 From: Nick Evans <2616208+nickevansuk@users.noreply.github.com> Date: Tue, 25 Feb 2025 16:05:27 +0000 Subject: [PATCH 5/5] Update generate-models.yaml --- .github/workflows/generate-models.yaml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/.github/workflows/generate-models.yaml b/.github/workflows/generate-models.yaml index b79ce4f..bb0dab8 100644 --- a/.github/workflows/generate-models.yaml +++ b/.github/workflows/generate-models.yaml @@ -36,11 +36,8 @@ jobs: run: npm start -- generate ${{ matrix.language }} --destination ../output/ working-directory: models-lib - test: - strategy: - matrix: - repo: ['OpenActive.NET', 'models-php', 'models-ruby', 'models-ts'] - - uses: openactive/${{ matrix.repo }}/.github/workflows/create-data-model-pr.yaml@ci/testable-build + test-ts: + needs: generate + uses: openactive/models-ts/.github/workflows/create-data-model-pr.yaml@ci/testable-build with: models-lib_ref: ${{ github.ref }}