Merge pull request #126 from isaqb-org/125-update-release-action

Update Release Action
isaqb-org · Nov 8, 2022 · 37a3a9d · 37a3a9d
2 parents 4ce8225 + 9fe7025
commit 37a3a9d
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 65 deletions.
diff --git a/.github/workflows/build_main.yml b/.github/workflows/build_main.yml
@@ -21,13 +21,13 @@ jobs:
  steps:
  # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
  - name: Checkout Source
- uses: actions/checkout@v2
+ uses: actions/checkout@v3
  with:
  submodules: recursive
  - name: Verify Gradle Wrapper
  uses: gradle/wrapper-validation-action@v1
  - name: Set up JDK 17
- uses: actions/setup-java@v2
+ uses: actions/setup-java@v3
  with:
  distribution: 'temurin'
  java-version: 17
@@ -42,17 +42,6 @@ jobs:
  - name: Set Environment Variables for Release Version
  if: startsWith(github.ref, 'refs/tags/')
  run: echo "RELEASE_VERSION=${GITHUB_REF:10}" >> $GITHUB_ENV
- - name: Create New Release
- if: startsWith(github.ref, 'refs/tags/')
- id: create-release
- uses: actions/create-release@latest
- env:
- GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token
- with:
- tag_name: ${{ env.RELEASE_VERSION }}
- release_name: Release ${{ env.RELEASE_VERSION }}
- draft: false
- prerelease: false
  - name: Prepare Deployment
  if: startsWith(github.ref, 'refs/tags/')
  run: |
@@ -62,6 +51,20 @@ jobs:
  mkdir release_dir
  cp ./build/curriculum-*.pdf ./release_dir 2>/dev/null || :
  mv release.zip ./release_dir/release-${{ env.RELEASE_VERSION }}.zip
+ - name: Create New Release
+ if: startsWith(github.ref, 'refs/tags/')
+ id: create-release
+ uses: ncipollo/release-action@v1
+ env:
+ GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token
+ with:
+ tag: ${{ env.RELEASE_VERSION }}
+ name: Release ${{ env.RELEASE_VERSION }}
+ draft: false
+ prerelease: false
+ bodyFile: "CHANGELOG.md"
+ artifacts: "LICENSE.adoc,release_dir/*.pdf,release_dir/*.zip"
+ token: ${{ secrets.GITHUB_TOKEN }}
  - name: Deploy
  if: startsWith(github.ref, 'refs/tags/')
  uses: peaceiris/actions-gh-pages@v3
@@ -71,22 +74,3 @@ jobs:
  user_name: 'github-actions[bot]'
  user_email: 'github-actions[bot]@users.noreply.github.com'
  commit_message: Publish Release ${{ env.RELEASE_VERSION }}
- - name: Upload Release Files
- if: startsWith(github.ref, 'refs/tags/')
- id: upload-release-assets
- uses: actions/github-script@v2
- env:
- GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- with:
- script: |
- const fs = require('fs').promises;
- const { repo: { owner, repo }, sha } = context;
-
- for (let file of await fs.readdir('./release_dir')) {
- await github.repos.uploadReleaseAsset({
- owner, repo,
- release_id: ${{ steps.create-release.outputs.id }},
- name: file,
- data: await fs.readFile(`./release_dir/${file}`)
- });
- }
diff --git a/.github/workflows/build_releasecandidate.yml b/.github/workflows/build_releasecandidate.yml
@@ -20,13 +20,13 @@ jobs:
  steps:
  # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
  - name: Checkout Source
- uses: actions/checkout@v2
+ uses: actions/checkout@v3
  with:
  submodules: recursive
  - name: Verify Gradle Wrapper
  uses: gradle/wrapper-validation-action@v1
  - name: Set up JDK 17
- uses: actions/setup-java@v2
+ uses: actions/setup-java@v3
  with:
  distribution: 'temurin'
  java-version: 17
@@ -41,17 +41,6 @@ jobs:
  - name: Set Environment Variables for Release Version
  if: startsWith(github.ref, 'refs/tags/')
  run: echo "RELEASE_VERSION=${GITHUB_REF:10}" >> $GITHUB_ENV
- - name: Create New Release Candidate
- if: startsWith(github.ref, 'refs/tags/')
- id: create-release-candidate
- uses: actions/create-release@latest
- env:
- GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token
- with:
- tag_name: ${{ env.RELEASE_VERSION }}
- release_name: Release Candidate ${{ env.RELEASE_VERSION }}
- draft: false
- prerelease: true
  - name: Prepare Deployment
  if: startsWith(github.ref, 'refs/tags/')
  run: |
@@ -61,6 +50,20 @@ jobs:
  mkdir release_dir
  cp ./build/curriculum-*.pdf ./release_dir 2>/dev/null || :
  mv release.zip ./release_dir/release-${{ env.RELEASE_VERSION }}.zip
+ - name: Create New Release Candidate
+ if: startsWith(github.ref, 'refs/tags/')
+ id: create-release-candidate
+ uses: ncipollo/release-action@v1
+ env:
+ GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token
+ with:
+ tag: ${{ env.RELEASE_VERSION }}
+ name: Release Candidate ${{ env.RELEASE_VERSION }}
+ draft: false
+ prerelease: true
+ bodyFile: "CHANGELOG.md"
+ artifacts: "LICENSE.adoc,release_dir/*.pdf,release_dir/*.zip"
+ token: ${{ secrets.GITHUB_TOKEN }}
  - name: Deploy Release Candidate to GitHub Pages
  if: startsWith(github.ref, 'refs/tags/')
  uses: peaceiris/actions-gh-pages@v3
@@ -72,22 +75,3 @@ jobs:
  user_name: 'github-actions[bot]'
  user_email: 'github-actions[bot]@users.noreply.github.com'
  commit_message: Publish Release Candidate ${{ env.RELEASE_VERSION }}
- - name: Upload Release Candidate Files
- if: startsWith(github.ref, 'refs/tags/')
- id: upload-release-candidate-assets
- uses: actions/github-script@v2
- env:
- GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- with:
- script: |
- const fs = require('fs').promises;
- const { repo: { owner, repo }, sha } = context;
-
- for (let file of await fs.readdir('./release_dir')) {
- await github.repos.uploadReleaseAsset({
- owner, repo,
- release_id: ${{ steps.create-release-candidate.outputs.id }},
- name: file,
- data: await fs.readFile(`./release_dir/${file}`)
- });
- }
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -0,0 +1,7 @@
+# New in 2020.6
+
+- CHANGELOG can be created from file
+- New section for Glossary
+- New release action
+- Latest aciidoctor stuff
+- Latest Gradle
diff --git a/document.version b/document.version
@@ -1 +1 @@
-2020.5
+2020.6