Skip to content

Commit

Permalink
Merge pull request #8 from manel-martos/develop
Browse files Browse the repository at this point in the history
PR test 7 - master prerelease
  • Loading branch information
manel-martos authored Apr 18, 2024
2 parents b9577f7 + 28737b1 commit 6c0c868
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 60 deletions.
2 changes: 1 addition & 1 deletion .github/actions/build-migration/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ inputs:
maven-settings:
description: The Maven settings file
required: false
default: $GITHUB_WORKSPACE/settings.xml
default: $GITHUB_WORKSPACE

runs:
using: "composite"
Expand Down
52 changes: 0 additions & 52 deletions .github/actions/maven-build-migration.yml

This file was deleted.

12 changes: 5 additions & 7 deletions .github/workflows/migration-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,7 @@ on:
pull_request: #triggers on PR merge event into develop branch
types:
- closed
branches:
- 'develop'


jobs:
setup: # defines the variables used across all job's steps and output variables to be used across jobs.
runs-on: ubuntu-latest
Expand All @@ -34,7 +32,7 @@ jobs:

- name: ReleaseProperties
id: release_props
if: startsWith(github.event.ref, 'refs/tags/**')
if: startsWith(github.ref, 'refs/tags')
shell: bash
run: |
echo "RELEASE_NAME=${{env.RELEASE_NAME}}" >> "$GITHUB_OUTPUT"
Expand All @@ -47,7 +45,7 @@ jobs:

- name: SnapshotProperties
id: snapshot_props
if: github.ref == 'refs/heads/develop'
if: github.ref == 'refs/heads/develop' && github.event.pull_request.merged == true
shell: bash
run: |
echo "SNAPSHOT_NAME=${{env.RELEASE_NAME}}" >> "$GITHUB_OUTPUT"
Expand All @@ -65,7 +63,7 @@ jobs:
steps:
- uses: actions/checkout@v4
- name: Build Release CI
if: startsWith(github.event.ref, 'refs/tags/**')
if: startsWith(github.event.ref, 'refs/tags')
uses: ./.github/actions/build-migration
with:
build-command: install
Expand All @@ -81,7 +79,7 @@ jobs:
CI_DEPLOY_PASSWORD: ${{secrets.CI_DEPLOY_PASSWORD}}

- name: Build Snapshot CI
if: github.ref == 'refs/heads/develop'
if: github.ref == 'refs/heads/develop' && github.event.pull_request.merged == true
uses: ./.github/actions/build-migration
with:
build-command: verify
Expand Down

0 comments on commit 6c0c868

Please sign in to comment.