Skip to content

Commit

Permalink
Attempt to fix release (#704)
Browse files Browse the repository at this point in the history
  • Loading branch information
DamianReeves authored Sep 1, 2024
1 parent 15619b2 commit 4b0a633
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
14 changes: 7 additions & 7 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ env:
on:
pull_request:
push:
branches: ["main"]
branches: ["main", "0.4.x"]
release:
types:
- published
Expand Down Expand Up @@ -88,7 +88,7 @@ jobs:
- name: Cache JS build output
# when in master repo: all commits to main branch and all additional tags
if: github.ref == 'refs/heads/main' || (github.ref != 'refs/heads/main' && startsWith( github.ref, 'refs/tags/') )
if: (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/0.4.x') || ((github.ref != 'refs/heads/main' && github.ref != 'refs/heads/0.4.x') && startsWith( github.ref, 'refs/tags/') )
uses: actions/cache/save@v4
with:
path: |
Expand Down Expand Up @@ -143,7 +143,7 @@ jobs:
- name: Cache JVM build output
# when in master repo: all commits to main branch and all additional tags
if: github.ref == 'refs/heads/main' || (github.ref != 'refs/heads/main' && startsWith( github.ref, 'refs/tags/') )
if: (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/0.4.x') || ((github.ref != 'refs/heads/main' && github.ref != 'refs/heads/0.4.x') && startsWith( github.ref, 'refs/tags/') )
uses: actions/cache/save@v4
with:
path: |
Expand All @@ -153,7 +153,7 @@ jobs:

############### SONATYPE SCAN ###############
sonatype-scan:
if: always()
if: github.repository_owner == 'finos'
needs: [ci]
runs-on: ubuntu-latest
steps:
Expand Down Expand Up @@ -213,7 +213,7 @@ jobs:

publish:
# when in master repo: all commits to main branch and all additional tags
if: github.repository == 'finos/morphir-scala' && ( github.ref == 'refs/heads/main' || (github.ref != 'refs/heads/main' && startsWith( github.ref, 'refs/tags/') ) )
if: github.repository == 'finos/morphir-scala' && ( github.ref == 'refs/heads/main' || github.ref == 'refs/head/0.4.x' || (github.ref != 'refs/heads/main' && github.ref != 'refs/heads/0.4.x' && startsWith( github.ref, 'refs/tags/') ) )
needs: [ci]

runs-on: ubuntu-latest
Expand All @@ -225,8 +225,8 @@ jobs:
env:
PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }}
PGP_SECRET: ${{ secrets.PGP_SECRET_BASE64 }}
SONATYPE_PASSWORD: ${{ secrets.MAVEN_DEPLOY_PASSWORD }}
SONATYPE_USERNAME: ${{ secrets.MAVEN_DEPLOY_USERNAME }}
SONATYPE_PASSWORD: ${{ secrets.ORG_MORPHIR_MAVEN_DEPLOY_PASSWORD }}
SONATYPE_USERNAME: ${{ secrets.ORG_MORPHIR_MAVEN_DEPLOY_USERNAME }}
PUBLISH_AS_SNAPSHOT: true
LANG: "en_US.UTF-8"
LC_MESSAGES: "en_US.UTF-8"
Expand Down
4 changes: 2 additions & 2 deletions build.sc
Original file line number Diff line number Diff line change
Expand Up @@ -566,8 +566,8 @@ object ci extends Module {
set.head
}
val publisher = new scalalib.publish.SonatypePublisher(
uri = "https://oss.sonatype.org/service/local",
snapshotUri = "https://oss.sonatype.org/content/repositories/snapshots",
uri = "https://s01.oss.sonatype.org/service/local",
snapshotUri = "https://s01.oss.sonatype.org/content/repositories/snapshots",
credentials = credentials,
signed = true,
// format: off
Expand Down

0 comments on commit 4b0a633

Please sign in to comment.