diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index c11e3929..6c3d0148 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -10,86 +10,17 @@ on: push: branches: - 'master' - workflow_call: - secrets: - WORKFLOW_ACCESS_TOKEN: - required: true env: REPOSITORY_NAME: '${{ github.event.repository.name }}' PROJECT_NAME: 'openponk-${{ github.event.repository.name }}' VERSION: 'nightly' + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} cache-name: zip-cache RUN_ID: ${{ github.run_id }} - PHARO_VERSION: 11 jobs: - - test-linux: - runs-on: ubuntu-latest - env: - PLATFORM: linux - name: 'Test Linux' - steps: - - name: Checkout repository - uses: actions/checkout@v4.1.0 - - name: Load SmalltalkCI environment - uses: hpi-swa/setup-smalltalkCI@1.3.4 - id: smalltalkci - with: - smalltalk-image: Pharo64-${{ env.PHARO_VERSION }} - - name: Prepare image and test - run: smalltalkci -s ${{ steps.smalltalkci.outputs.smalltalk-image }} - shell: bash - timeout-minutes: 12 - - test-win: - runs-on: windows-latest - env: - PLATFORM: win - name: 'Test Windows' - steps: - - name: Checkout repository - uses: actions/checkout@v4.1.0 - - name: Load SmalltalkCI environment - uses: hpi-swa/setup-smalltalkCI@1.3.4 - id: smalltalkci - with: - smalltalk-image: Pharo64-${{ env.PHARO_VERSION }} - - name: Prepare image and test - run: smalltalkci -s ${{ steps.smalltalkci.outputs.smalltalk-image }} - shell: bash - timeout-minutes: 20 - - create-dependent-matrix: - runs-on: ubuntu-latest - name: 'Find dependent repositories' - if: ${{ github.event_name == 'push' || contains(github.event.inputs.build-dependent || false, 'true') }} - outputs: - matrix: ${{ steps.set-matrix.outputs.matrix }} - steps: - - name: Checkout repository - uses: actions/checkout@v4.1.0 - - name: Check list of repositories exists - id: check-file - run: test -f ./.github/dependent-repositories.txt || exit 1 - - name: Create dependent build matrix - id: set-matrix - run: echo "::set-output name=matrix::`cat ./.github/dependent-repositories.txt | tr -d " \t\n\r"`" - - build-dependent: - needs: [test-linux, test-win, create-dependent-matrix] - runs-on: ubuntu-latest - name: 'Build dependent' - if: ${{ contains(needs.create-dependent-matrix.outputs.matrix, '/') }} - strategy: - matrix: ${{fromJson(needs.create-dependent-matrix.outputs.matrix)}} - steps: - - name: Start ${{ matrix.repository }} build - uses: benc-uk/workflow-dispatch@v1.2.2 - with: - workflow: Nightly - repo: ${{ matrix.repository }} - ref: ${{ matrix.branch }} - token: ${{ secrets.WORKFLOW_ACCESS_TOKEN }} - inputs: '{ "build-dependent": "${{ matrix.build-dependent }}" }' + OP: + uses: OpenPonk/ci-scripts/.github/workflows/test-nightly.yml@master + secrets: + WORKFLOW_ACCESS_TOKEN: ${{ secrets.WORKFLOW_ACCESS_TOKEN }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a7f7b885..06f55f82 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -3,44 +3,14 @@ name: Release on: release: types: [published] - workflow_call: env: REPOSITORY_NAME: '${{ github.event.repository.name }}' PROJECT_NAME: 'openponk-${{ github.event.repository.name }}' VERSION: ${{ github.event.release.tag_name }} + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} RUN_ID: ${{ github.run_id }} - PHARO_VERSION: 11 jobs: - test-linux: - runs-on: ubuntu-latest - env: - PLATFORM: ${{ github.job }} - name: 'Test Linux' - steps: - - uses: actions/checkout@v4.1.0 - - uses: hpi-swa/setup-smalltalkCI@1.3.4 - id: smalltalkci - with: - smalltalk-image: Pharo64-${{ env.PHARO_VERSION }} - - name: Prepare image and test - run: smalltalkci -s ${{ steps.smalltalkci.outputs.smalltalk-image }} - shell: bash - timeout-minutes: 12 - - test-win: - runs-on: windows-latest - env: - PLATFORM: ${{ github.job }} - name: 'Test Windows' - steps: - - uses: actions/checkout@v4.1.0 - - uses: hpi-swa/setup-smalltalkCI@1.3.4 - id: smalltalkci - with: - smalltalk-image: Pharo64-${{ env.PHARO_VERSION }} - - name: Prepare image and test - run: smalltalkci -s ${{ steps.smalltalkci.outputs.smalltalk-image }} - shell: bash - timeout-minutes: 20 + OP: + uses: OpenPonk/ci-scripts/.github/workflows/test-release.yml@master \ No newline at end of file diff --git a/repository/BaselineOfOpenPonk/BaselineOfOpenPonk.class.st b/repository/BaselineOfOpenPonk/BaselineOfOpenPonk.class.st index 7c642313..a5add2ab 100644 --- a/repository/BaselineOfOpenPonk/BaselineOfOpenPonk.class.st +++ b/repository/BaselineOfOpenPonk/BaselineOfOpenPonk.class.st @@ -106,13 +106,13 @@ BaselineOfOpenPonk >> loadRoassal3 [ exporters := Metacello new. exporters baseline: 'Roassal3Exporters'; - repository: 'github://OpenPonk/Roassal3Exporters:master'; + repository: 'github://ObjectProfile/Roassal3Exporters:6c61b1f'; lock; onConflictUseLoaded. [ Metacello new baseline: 'Roassal3'; - repository: 'github://OpenPonk/Roassal3:master'; + repository: 'github://ObjectProfile/Roassal3:v1.03'; lock; load: #Full ] on: MCMergeOrLoadWarning