Merge pull request #54 from estivensh4/release/0.6.0

Release/0.6.0
estivensh · Nov 27, 2023 · 1b274f9 · 1b274f9
2 parents 1cd68c1 + 991edf5
commit 1b274f9
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 24 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -5,11 +5,6 @@ on:
     branches:
       - main
       - release/*
-  push:
-    branches:
-      - main
-      - release/*
-
 env:
   OSSH_USERNAME: ${{ secrets.OSSH_USERNAME }}
   OSSH_PASSWORD: ${{ secrets.OSSH_PASSWORD }}
@@ -20,7 +15,7 @@ env:
 
 jobs:
   build-library:
-    if: github.event_name == 'pull_request' && github.event.action == 'opened' && startsWith(github.event.pull_request.head.ref, 'samples/')
+    #if: github.event_name == 'pull_request' && github.event.action == 'opened' && startsWith(github.event.pull_request.head.ref, 'samples/')
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
@@ -49,6 +44,7 @@ jobs:
           AWS_SECRET_KEY_SCAPE=$(echo "$AWS_SECRET_KEY" | sed 's/[\&/]/\\&/g')
           
           sed -i -e "s/private val accessKey = .*/private val accessKey = \"$AWS_ACCESS_KEY_SCAPE\"/" -e "s/private val secretKey = .*/private val secretKey = \"$AWS_SECRET_KEY_SCAPE\"/" aws-s3/src/commonTest/kotlin/com/estivensh4/s3/AWSS3CommonTest.kt
+          sed -i -e "s/private val accessKey = .*/private val accessKey = \"$AWS_ACCESS_KEY_SCAPE\"/" -e "s/private val secretKey = .*/private val secretKey = \"$AWS_SECRET_KEY_SCAPE\"/" aws-dynamo/src/commonTest/kotlin/com/estivensh4/dynamo/AWSDynamoTest.kt
           cat aws-s3/src/commonTest/kotlin/com/estivensh4/s3/AWSS3CommonTest.kt
         working-directory: ${{ github.workspace }}/
       - name: Check
@@ -73,7 +69,7 @@ jobs:
           name: code-coverage-report-${{ github.job }}
           path: "**/build/reports/**/*"
   check-sample-android-app:
-    if: github.event_name == 'pull_request' && github.event.action == 'opened' && startsWith(github.event.pull_request.head.ref, 'samples/')
+    #if: github.event_name == 'pull_request' && github.event.action == 'opened' && startsWith(github.event.pull_request.head.ref, 'samples/')
     needs: build-library
     runs-on: ubuntu-latest
     steps:
@@ -85,7 +81,7 @@ jobs:
           target: androidapp
           githubToken: ${{ secrets.GITHUB_TOKEN }}
   check-sample-desktop-app:
-    if: github.event_name == 'pull_request' && github.event.action == 'opened' && startsWith(github.event.pull_request.head.ref, 'samples/')
+    #if: github.event_name == 'pull_request' && github.event.action == 'opened' && startsWith(github.event.pull_request.head.ref, 'samples/')
     needs: build-library
     runs-on: ubuntu-latest
     steps:
@@ -97,7 +93,7 @@ jobs:
           target: desktopApp
           githubToken: ${{ secrets.GITHUB_TOKEN }}
   check-sample-wear-app:
-    if: github.event_name == 'pull_request' && github.event.action == 'opened' && startsWith(github.event.pull_request.head.ref, 'samples/')
+    #if: github.event_name == 'pull_request' && github.event.action == 'opened' && startsWith(github.event.pull_request.head.ref, 'samples/')
     needs: build-library
     runs-on: ubuntu-latest
     steps:
@@ -109,7 +105,7 @@ jobs:
           target: wearapp
           githubToken: ${{ secrets.GITHUB_TOKEN }}
   check-sample-web-app:
-    if: github.event_name == 'pull_request' && github.event.action == 'opened' && startsWith(github.event.pull_request.head.ref, 'samples/')
+   # if: github.event_name == 'pull_request' && github.event.action == 'opened' && startsWith(github.event.pull_request.head.ref, 'samples/')
     needs: build-library
     runs-on: ubuntu-latest
     steps:

diff --git a/.github/workflows/code-coverage.yml b/.github/workflows/code-coverage.yml
@@ -1,11 +1,6 @@
 name: SonarCloud verify and publish code coverage
 
 on:
-  push:
-    branches: [ "main" ]
-    paths-ignore: [ '**.md', '**.MD', '!docs/**' ]
-    tags-ignore:
-      - '**'
   pull_request:
     branches: [ "main" ]
     types: ["opened", "synchronize", "reopened"]
@@ -21,7 +16,7 @@ permissions:
 
 jobs:
   build:
-    if: github.event_name == 'pull_request' && github.event.action == 'opened' && startsWith(github.event.pull_request.head.ref, 'samples/')
+    #if: github.event_name == 'pull_request' && github.event.action == 'opened' && startsWith(github.event.pull_request.head.ref, 'samples/')
     name: Build and analyze
     runs-on: self-hosted
     steps:
@@ -54,7 +49,9 @@ jobs:
 
           sed -i '' "s|private val accessKey = .*|private val accessKey = \"$AWS_ACCESS_KEY\"|g" aws-s3/src/commonTest/kotlin/com/estivensh4/s3/AWSS3CommonTest.kt
           sed -i '' "s|private val secretKey = .*|private val secretKey = \"$AWS_SECRET_KEY\"|g" aws-s3/src/commonTest/kotlin/com/estivensh4/s3/AWSS3CommonTest.kt
-          cat aws-s3/src/commonTest/kotlin/com/estivensh4/s3/AWSS3CommonTest.kt
+          
+          sed -i '' "s|private val accessKey = .*|private val accessKey = \"$AWS_ACCESS_KEY\"|g" aws-dynamo/src/commonTest/kotlin/com/estivensh4/dynamo/AWSDynamoTest.kt
+          sed -i '' "s|private val secretKey = .*|private val secretKey = \"$AWS_SECRET_KEY\"|g" aws-dynamo/src/commonTest/kotlin/com/estivensh4/dynamo/AWSDynamoTest.kt
         working-directory: ${{ github.workspace }}/
       - name: Kover verify
         run: ./gradlew koverVerify

diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml
@@ -4,9 +4,6 @@ on:
   pull_request:
     branches:
       - main
-  push:
-    branches:
-      - main
 
 permissions: write-all
 
@@ -18,7 +15,7 @@ env:
 
 jobs:
   build-documentation:
-    if: github.event_name == 'pull_request' && github.event.action == 'opened' && startsWith(github.event.pull_request.head.ref, 'samples/')
+    #if: github.event_name == 'pull_request' && github.event.action == 'opened' && startsWith(github.event.pull_request.head.ref, 'samples/')
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
@@ -65,7 +62,7 @@ jobs:
           instance: ${{ env.INSTANCE }}
 
   deploy-documentation:
-    if: github.event_name == 'pull_request' && github.event.action == 'opened' && startsWith(github.event.pull_request.head.ref, 'samples/')
+   # if: github.event_name == 'pull_request' && github.event.action == 'opened' && startsWith(github.event.pull_request.head.ref, 'samples/')
     environment:
       name: github-pages
       url: ${{ steps.deployment.outputs.page_url }}

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -27,7 +27,7 @@ env:
 
 jobs:
   pre-build:
-    if: github.event_name == 'pull_request' && github.event.action == 'opened' && startsWith(github.event.pull_request.head.ref, 'samples/')
+    #if: github.event_name == 'pull_request' && github.event.action == 'opened' && startsWith(github.event.pull_request.head.ref, 'samples/')
     name: Publish library at mavenCentral
     runs-on: self-hosted
     steps:
@@ -47,14 +47,17 @@ jobs:
 
           sed -i '' "s|private val accessKey = .*|private val accessKey = \"$AWS_ACCESS_KEY\"|g" aws-s3/src/commonTest/kotlin/com/estivensh4/s3/AWSS3CommonTest.kt
           sed -i '' "s|private val secretKey = .*|private val secretKey = \"$AWS_SECRET_KEY\"|g" aws-s3/src/commonTest/kotlin/com/estivensh4/s3/AWSS3CommonTest.kt
+          
+          sed -i '' "s|private val accessKey = .*|private val accessKey = \"$AWS_ACCESS_KEY\"|g" aws-dynamo/src/commonTest/kotlin/com/estivensh4/dynamo/AWSDynamoTest.kt
+          sed -i '' "s|private val secretKey = .*|private val secretKey = \"$AWS_SECRET_KEY\"|g" aws-dynamo/src/commonTest/kotlin/com/estivensh4/dynamo/AWSDynamoTest.kt
           cat aws-s3/src/commonTest/kotlin/com/estivensh4/s3/AWSS3CommonTest.kt
         working-directory: ${{ github.workspace }}/
       - name: Prebuild library
         run: ./gradlew publishToMavenLocal
       - name: Publish library
         run: ./gradlew publish --no-parallel
   release:
-    if: github.event_name == 'pull_request' && github.event.action == 'opened' && startsWith(github.event.pull_request.head.ref, 'samples/')
+   # if: github.event_name == 'pull_request' && github.event.action == 'opened' && startsWith(github.event.pull_request.head.ref, 'samples/')
     name: Create release v${{ github.event.inputs.version }}
     needs: pre-build
     runs-on: self-hosted