ci: fixes

dima117 · Jul 15, 2023 · 7613994 · 7613994
1 parent fafc2af
commit 7613994
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/.github/workflows/lint-and-test.yml b/.github/workflows/lint-and-test.yml
@@ -28,7 +28,6 @@ jobs:
         run: npx commitlint --from ${{ inputs.commit-from }} --to ${{ inputs.commit-to }} --verbose
 
   tests:
-    continue-on-error: true
     runs-on: ubuntu-latest
     needs: lint
     env:
@@ -41,10 +40,12 @@ jobs:
       - name: Install deps
         run: npm ci
       - name: Run unit tests
+        continue-on-error: true
         run: npm run test
       - name: Install Playwright Browsers
         run: npx playwright install chromium --with-deps
       - name: Run Playwright tests
+        continue-on-error: true
         run: npm run e2e
       - uses: actions/upload-artifact@v3
         if: always()

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -29,7 +29,7 @@ jobs:
           echo "RELEASE_AUTHOR=$(git for-each-ref --format="%(authorname) %(authoremail)" refs/tags/$id)" >> $GITHUB_ENV
           echo "RELEASE_DATE=$(git for-each-ref --format="%(authordate)" refs/tags/$id)" >> $GITHUB_ENV
           
-          LOG=$(git log $(git describe --tags --abbrev=0 --exclude=v1)..HEAD --oneline)
+          LOG=$(git log $(git describe --tags --abbrev=0 --exclude=$id)..HEAD --oneline)
           echo "RELEASE_BODY<<EOF" >> $GITHUB_ENV
           echo "$LOG" >> $GITHUB_ENV
           echo "EOF" >> $GITHUB_ENV
@@ -74,6 +74,7 @@ jobs:
             console.log(result)
             throw new Error("Issue не найдена")
 
+
   write-changelog-comment:
     runs-on: ubuntu-latest
     if: always() && contains(github.ref, 'refs/heads/')
@@ -99,10 +100,13 @@ jobs:
               body: `Добавлены изменения в релиз:\n\n${CHANGELOG}`
             })
 
+
   lint-and-test:
+    needs: get-issue-id
+    if: always()
     uses: ./.github/workflows/lint-and-test.yml
     with:
-      commit-from: ${{ startsWith(github.ref, 'refs/heads/') && github.event.before || '$(git describe --tags --abbrev=0 --exclude=v1)' }}
+      commit-from: ${{ startsWith(github.ref, 'refs/heads/') && github.event.before || '$(git describe --tags --abbrev=0 --exclude=$(echo "${{github.ref}}" | cut -d / -f4))' }}
       commit-to: ${{ startsWith(github.ref, 'refs/heads/') && github.event.after || github.ref }}
 
   write-result-comment:
@@ -131,6 +135,7 @@ jobs:
               body,
             })
 
+
   build-and-deploy:
     needs: lint-and-test
     if: always() && success()