Skip to content

Commit

Permalink
Merge pull request #2546 from moosetechnology/Update-moose11
Browse files Browse the repository at this point in the history
Use same workflows as M12
  • Loading branch information
ClotildeToullec authored Sep 9, 2024
2 parents e6bc779 + 0773e12 commit 9b7e3f6
Show file tree
Hide file tree
Showing 6 changed files with 36 additions and 193 deletions.
72 changes: 0 additions & 72 deletions .github/workflows/continuous.yml

This file was deleted.

28 changes: 0 additions & 28 deletions .github/workflows/get-versions.yml

This file was deleted.

72 changes: 7 additions & 65 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -1,71 +1,13 @@
name: Stable
name: Build release

on:
release:
types: [created, edited]

jobs:

# Read the content of the files pharo-versions.json and moose-version.json.
get-versions:
runs-on: ubuntu-latest
outputs:
versions: ${{ steps.read-file.outputs.versions }}
steps:
- uses: actions/checkout@v4
with:
ref: ${{ github.ref }}
- name: Read file
id: read-file
run: |
VERSIONS=$(cat $GITHUB_WORKSPACE/.github/workflows/versions.json)
echo "versions=$VERSIONS" >> $GITHUB_OUTPUT
build:
runs-on: ubuntu-latest
needs: get-versions
env:
PROJECT_NAME: ${{ fromJSON(needs.get-versions.outputs.versions).moose-name }}
strategy:
fail-fast: false
matrix:
smalltalk: ${{ fromJSON(needs.get-versions.outputs.versions).pharo-versions }}
name: ${{ matrix.smalltalk }}
steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0 # Option fetching all commits
- uses: hpi-swa/setup-smalltalkCI@v1
with:
smalltalk-image: ${{ matrix.smalltalk }}
- run: smalltalkci -s ${{ matrix.smalltalk }}
shell: bash
timeout-minutes: 15

- name: set-version
run: |
ls -l $SMALLTALK_CI_VM
$SMALLTALK_CI_VM $SMALLTALK_CI_IMAGE eval --save "MooseVersion current commitHash: '$GITHUB_SHA'. (Smalltalk tools toolNamed: #mooseWelcome) closePharoWelcomeThenOpen"
- name: Package
run: |
mv /home/runner/.smalltalkCI/_builds/* .
mv TravisCI.image $PROJECT_NAME-${{ matrix.smalltalk }}.image
mv TravisCI.changes $PROJECT_NAME-${{ matrix.smalltalk }}.changes
echo ${${{ matrix.smalltalk }}} | sed -e 's/.*\-//g ; s/\..*//g ; s/$/0/' > pharo.version
# Remove every character before '-' ; Remove point and anything after it ; add a '0'.
# This pattern transforms as follow: 'Pharo64-9.0' --> '90' and 'Pharo64-10' --> '100'.
- name: Zip package
run: |
zip -r $PROJECT_NAME-${{ matrix.smalltalk }}.zip $PROJECT_NAME-${{ matrix.smalltalk }}.image $PROJECT_NAME-${{ matrix.smalltalk }}.changes *.sources pharo.version
ls
- name: Update release
uses: Xotl/cool-github-releases@v1
with:
mode: update
replace_assets: true
tag_name: ${{ fromJSON(needs.get-versions.outputs.versions).release-tag }}
assets: ${{ env.PROJECT_NAME }}-${{ matrix.smalltalk }}.zip
github_token: ${{ secrets.GITHUB_TOKEN }}
run-tests-and-update-release:
name: Run tests and update release
uses: moosetechnology/.github/.github/workflows/test-and-release.yml@main
with:
pre-upload-script: "MooseVersion current commitHash: '$GITHUB_SHA'. (Smalltalk tools toolNamed: #mooseWelcome) closePharoWelcomeThenOpen"
release-tag: ${{ github.ref }}
24 changes: 24 additions & 0 deletions .github/workflows/test-and-release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
name: Development
run-name: >-
${{ vars.BRANCHES_CONFIGURATION
&& fromJSON(vars.BRANCHES_CONFIGURATION)[github.ref_name]
&& fromJSON(vars.BRANCHES_CONFIGURATION)[github.ref_name].run-name
|| github.ref_name }} #Dedicated name in the Repository variable OR branch name
on:
push:
branches:
- development
- v10
- v11
schedule:
- cron: '0 0 * * *'
# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:

jobs:
run-tests-and-update-release:
name: Run tests and update release
uses: moosetechnology/.github/.github/workflows/test-and-release.yml@main
with:
pre-upload-script: "MooseVersion current commitHash: '$GITHUB_SHA'. (Smalltalk tools toolNamed: #mooseWelcome) closePharoWelcomeThenOpen"
32 changes: 5 additions & 27 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,30 +5,8 @@ on:
types: [assigned, opened, synchronize, reopened]

jobs:

# Get the content of the file versions.json. It is interpreted as a json data in the next job.
get-versions:
uses: ./.github/workflows/get-versions.yml
with:
file-path: $GITHUB_WORKSPACE/.github/workflows/versions.json

# Run tests on pharo versions described in the file pharo-versions.json
build:
runs-on: ubuntu-latest
needs:
- get-versions
strategy:
fail-fast: false
matrix:
smalltalk: ${{ fromJSON(needs.get-versions.outputs.versions).pharo-versions }}
name: ${{ matrix.smalltalk }}
steps:
- uses: actions/checkout@v3
with:
fetch-depth: 0 # Option fetching all commits
- uses: hpi-swa/setup-smalltalkCI@v1
with:
smalltalk-image: ${{ matrix.smalltalk }}
- run: smalltalkci -s ${{ matrix.smalltalk }}
shell: bash
timeout-minutes: 15
run:
uses: moosetechnology/.github/.github/workflows/run-tests.yml@main
secrets: inherit
with:
create-artifact: true
1 change: 0 additions & 1 deletion .github/workflows/versions.json

This file was deleted.

0 comments on commit 9b7e3f6

Please sign in to comment.