#25 final version of release note generation

kasramp · Apr 30, 2023 · 74d7d6d · 74d7d6d
1 parent 40f2f94
commit 74d7d6d
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 36 deletions.
diff --git a/.github/workflows/build_and_release.yml b/.github/workflows/build_and_release.yml
@@ -56,18 +56,19 @@ jobs:
         shell: bash
         run: |
           echo "::set-output name=TAGGED_VERSION::$(git for-each-ref --sort=-creatordate --format='%(refname:short)' refs/tags --count 10 | grep -oP '^eris-(\d+).*' | head -1)"
-      - name: Generate Release Notes
+      - name: Generate release note
         uses: release-drafter/[email protected]
-        id: release-drafter
+        id: release_note
+        if: ${{ github.ref == 'refs/heads/master' }}
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           config-name: release.yml
       - name: Perform release
         uses: softprops/action-gh-release@v1
-        if: ${{ github.ref == 'refs/heads/develop' }}
+        if: ${{ github.ref == 'refs/heads/master' }}
         with:
           tag_name: ${{ steps.tagged_version.outputs.TAGGED_VERSION }}
-          body: ${{ steps.release-drafter.outputs.changelog }}
+          body: ${{ steps.release_note.outputs.changelog }}
           files: |
             target/*.jar
diff --git a/.github/workflows/generate_release_note.yml b/.github/workflows/generate_release_note.yml
diff --git a/pom.xml b/pom.xml
@@ -115,12 +115,12 @@
             <version>5.3.1</version>
             <scope>test</scope>
         </dependency>
-<!--        <dependency>-->
-<!--            <groupId>org.owasp</groupId>-->
-<!--            <artifactId>dependency-check-maven</artifactId>-->
-<!--            <version>8.2.1</version>-->
-<!--            <type>maven-plugin</type>-->
-<!--        </dependency>-->
+        <dependency>
+            <groupId>org.owasp</groupId>
+            <artifactId>dependency-check-maven</artifactId>
+            <version>8.2.1</version>
+            <type>maven-plugin</type>
+        </dependency>
     </dependencies>
 
     <dependencyManagement>
@@ -185,18 +185,18 @@
                 <artifactId>maven-surefire-plugin</artifactId>
                 <version>3.0.0</version>
             </plugin>
-<!--            <plugin>-->
-<!--                <groupId>org.owasp</groupId>-->
-<!--                <artifactId>dependency-check-maven</artifactId>-->
-<!--                <version>8.2.1</version>-->
-<!--                <executions>-->
-<!--                    <execution>-->
-<!--                        <goals>-->
-<!--                            <goal>check</goal>-->
-<!--                        </goals>-->
-<!--                    </execution>-->
-<!--                </executions>-->
-<!--            </plugin>-->
+            <plugin>
+                <groupId>org.owasp</groupId>
+                <artifactId>dependency-check-maven</artifactId>
+                <version>8.2.1</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>check</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-failsafe-plugin</artifactId>