final wrap up

raw-labs · Apr 2, 2024 · 48a2762 · 48a2762
1 parent 7aff55c
commit 48a2762
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 36 deletions.
diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml
@@ -127,23 +127,15 @@ jobs:
         token: ${{ secrets.RAW_CI_PAT }}
         event-type: release
         client-payload: '{"ref": "${{ github.ref }}", "tag": "${{ github.ref_name }}"}'
-    - if: success() && github.event_name == 'repository_dispatch'
-      uses: peter-evans/create-or-update-comment@v4
-      with:
-        token: ${{ secrets.RAW_CI_PAT }}
-        repository: ${{ github.event.client_payload.github.payload.repository.full_name }}
-        comment-id: ${{ github.event.client_payload.github.payload.comment.id }}
-        body: |
-          > run [${{ github.run_id }}/${{ env.GITHUB_JOB }}](${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}) success :heavy_check_mark:
-        reactions: hooray
     - if: failure() && github.event_name == 'repository_dispatch'
       uses: peter-evans/create-or-update-comment@v4
       with:
         token: ${{ secrets.RAW_CI_PAT }}
         repository: ${{ github.event.client_payload.github.payload.repository.full_name }}
         comment-id: ${{ github.event.client_payload.github.payload.comment.id }}
         body: |
-          > run [${{ github.run_id }}/${{ env.GITHUB_JOB }}](${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}) failed :x:
+          > something went wrong with `publish-snapi-components`
+          > run [${{ github.run_id }}](${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}) failed :x:
         reactions: confused
 
   publish-snapi-parser:
@@ -211,27 +203,13 @@ jobs:
         body: |
           > published snapi-parser version: ${{ env.SNAPI_PARSER_VER }}
         reactions: rocket
-    - if: success() && github.event_name == 'push' && contains(github.ref, 'refs/tags/')
-      uses: peter-evans/repository-dispatch@v3
-      with:
-        token: ${{ secrets.RAW_CI_PAT }}
-        event-type: release
-        client-payload: '{"ref": "${{ github.ref }}", "tag": "${{ github.ref_name }}"}'
-    - if: success() && github.event_name == 'repository_dispatch'
-      uses: peter-evans/create-or-update-comment@v4
-      with:
-        token: ${{ secrets.RAW_CI_PAT }}
-        repository: ${{ github.event.client_payload.github.payload.repository.full_name }}
-        comment-id: ${{ github.event.client_payload.github.payload.comment.id }}
-        body: |
-          > run [${{ github.run_id }}/${{ env.GITHUB_JOB }}](${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}) success :heavy_check_mark:
-        reactions: hooray
     - if: failure() && github.event_name == 'repository_dispatch'
       uses: peter-evans/create-or-update-comment@v4
       with:
         token: ${{ secrets.RAW_CI_PAT }}
         repository: ${{ github.event.client_payload.github.payload.repository.full_name }}
         comment-id: ${{ github.event.client_payload.github.payload.comment.id }}
         body: |
-          > run [${{ github.run_id }}/${{ env.GITHUB_JOB }}](${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}) failed :x:
+          > something went wrong with `publish-snapi-parser`
+          > run [${{ github.run_id }}](${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}) :x:
         reactions: confused
diff --git a/snapi-frontend/build.sbt b/snapi-frontend/build.sbt
@@ -137,7 +137,7 @@ outputVersion := {
 
 // Publish settings
 Test / publishArtifact := true
-// Useful for debugging
+// Useful for debugging 
 Test / packageSrc / publishArtifact := true
 
 Compile / packageSrc / publishArtifact := true
@@ -151,7 +151,6 @@ libraryDependencies ++= Seq(
   commonsLang,
   commonsText,
   apacheHttpClient,
-  apacheHttpCore,
   icuDeps,
   woodstox,
   kiama,

diff --git a/snapi-frontend/project/Dependencies.scala b/snapi-frontend/project/Dependencies.scala
@@ -13,12 +13,9 @@ object Dependencies {
 
   val kiamaVersion = IO.read(new File("../deps/kiama/version")).trim
 
-
   val aws =
-    "software.amazon.awssdk" % "s3" % "2.20.162" excludeAll(
-      ExclusionRule(organization = "commons-logging", name = "commons-logging"),
-      //ExclusionRule(organization = "org.apache.httpcomponents", name = "httpcore")
-      )
+    "software.amazon.awssdk" % "s3" % "2.20.69" exclude ("commons-logging", "commons-logging") // spring.jcl is the correct replacement for this one.
+
   val woodstox = "com.fasterxml.woodstox" % "woodstox-core" % "6.5.1"
 
   val kiama = "org.bitbucket.inkytonik.kiama" %% "kiama" % kiamaVersion
@@ -33,8 +30,6 @@ object Dependencies {
 
   val apacheHttpClient = "org.apache.httpcomponents.client5" % "httpclient5" % "5.2.1"
 
-  val apacheHttpCore = "org.apache.httpcomponents.core5" % "httpcore5" % "5.2.1"
-
   val dropboxSDK = "com.dropbox.core" % "dropbox-core-sdk" % "5.4.5"
 
   val postgresqlDeps = "org.postgresql" % "postgresql" % "42.5.4"

diff --git a/snapi-parser/publish.sh b/snapi-parser/publish.sh
@@ -10,4 +10,4 @@ cd "$SCRIPT_HOME"
 
 VERSION=$(git describe --tags | sed 's/^v//;s/-\([0-9]*\)-g/+\1-/')
 mvn clean deploy -Pdev,deploy -Drevision=$VERSION
-echo "${VERSION}" > version
+echo "${VERSION}-SNAPSHOT" > version