chore: v15 release (#22821)

* chore: set base version * ci: update CI config for v15 * chore: update releaserc
frappe · Oct 20, 2023 · c3eecde · c3eecde
1 parent 4d54e8a
commit c3eecde
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 257 deletions.
diff --git a/.github/helper/ci.py b/.github/helper/ci.py
diff --git a/.github/helper/translation.py b/.github/helper/translation.py
diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml
@@ -2,7 +2,7 @@ name: Generate Semantic Release
 on:
   push:
     branches:
-      - version-14-beta
+      - version-15
 permissions:
   contents: read
 

diff --git a/.github/workflows/server-tests.yml b/.github/workflows/server-tests.yml
@@ -49,7 +49,6 @@ jobs:
       fail-fast: false
       matrix:
        db: ["mariadb", "postgres"]
-       container: [1, 2]
 
     services:
       mariadb:
@@ -130,25 +129,13 @@ jobs:
           DB: ${{ matrix.db }}
 
       - name: Run Tests
-        run: ../env/bin/python3 ../apps/frappe/.github/helper/ci.py
-        working-directory: /home/runner/frappe-bench/sites
-        env:
-          SITE: test_site
-          CI_BUILD_ID: ${{ github.run_id }}
-          BUILD_NUMBER: ${{ matrix.container }}
-          TOTAL_BUILDS: 2
-          COVERAGE_RCFILE: /home/runner/frappe-bench/apps/frappe/.coveragerc
+        run: bench --site test_site run-parallel-tests
+        working-directory: /home/runner/frappe-bench
 
       - name: Show bench output
         if: ${{ always() }}
         run: cat ~/frappe-bench/bench_start.log || true
 
-      - name: Upload coverage data
-        uses: actions/upload-artifact@v3
-        with:
-          name: coverage-${{ matrix.db }}-${{ matrix.container }}
-          path: /home/runner/frappe-bench/sites/coverage.xml
-
   # This is required because github still doesn't understand knowingly skipped tests
   faux-test:
     name: Unit Tests
@@ -159,28 +146,7 @@ jobs:
     strategy:
       matrix:
        db: ["mariadb", "postgres"]
-       container: [1, 2]
 
     steps:
       - name: Pass skipped tests unconditionally
         run: "echo Skipped"
-
-  coverage:
-    name: Coverage Wrap Up
-    needs: [test, checkrun]
-    runs-on: ubuntu-latest
-    if: ${{ needs.checkrun.outputs.build == 'strawberry' }}
-    steps:
-      - name: Clone
-        uses: actions/checkout@v4
-
-      - name: Download artifacts
-        uses: actions/download-artifact@v3
-
-      - name: Upload coverage data
-        uses: codecov/codecov-action@v3
-        with:
-          name: Server
-          fail_ci_if_error: true
-          verbose: true
-          flags: server
diff --git a/.github/workflows/ui-tests.yml b/.github/workflows/ui-tests.yml
@@ -128,9 +128,6 @@ jobs:
           cd ~/frappe-bench/apps/frappe
           git diff --exit-code yarn.lock
 
-      - name: Instrument Source Code
-        run: cd ~/frappe-bench/apps/frappe/ && npx nyc instrument -x 'frappe/public/dist/**' -x 'frappe/public/js/lib/**' -x '**/*.bundle.js' --compact=false --in-place frappe
-
       - name: Build
         run: cd ~/frappe-bench/ && bench build --apps frappe
 
@@ -141,28 +138,10 @@ jobs:
           bench --site test_site execute frappe.tests.ui_test_helpers.create_test_user
 
       - name: UI Tests
-        run: cd ~/frappe-bench/ && bench --site test_site run-ui-tests frappe --with-coverage --headless --parallel --ci-build-id $GITHUB_RUN_ID-$GITHUB_RUN_ATTEMPT
+        run: cd ~/frappe-bench/ && bench --site test_site run-ui-tests frappe --headless --parallel --ci-build-id $GITHUB_RUN_ID-$GITHUB_RUN_ATTEMPT
         env:
           CYPRESS_RECORD_KEY: 4a48f41c-11b3-425b-aa88-c58048fa69eb
 
-      - name: Stop server and wait for coverage file
-        run: |
-          ps -ef | grep "[f]rappe serve" | awk '{print $2}' | xargs kill -s SIGINT
-          sleep 5
-          ( tail -f /home/runner/frappe-bench/sites/coverage.xml & ) | grep -q "\/coverage"
-
-      - name: Upload JS coverage data
-        uses: actions/upload-artifact@v3
-        with:
-          name: coverage-js-${{ matrix.container }}
-          path: /home/runner/frappe-bench/apps/frappe/.cypress-coverage/clover.xml
-
-      - name: Upload python coverage data
-        uses: actions/upload-artifact@v3
-        with:
-          name: coverage-py-${{ matrix.container }}
-          path: /home/runner/frappe-bench/sites/coverage.xml
-
       - name: Show bench output
         if: ${{ always() }}
         run: cat ~/frappe-bench/bench_start.log || true
@@ -179,34 +158,3 @@ jobs:
     steps:
       - name: Pass skipped tests unconditionally
         run: "echo Skipped"
-
-  coverage:
-    name: Coverage Wrap Up
-    needs: [test, checkrun]
-    if: ${{ needs.checkrun.outputs.build == 'strawberry' }}
-    runs-on: ubuntu-latest
-    steps:
-      - name: Clone
-        uses: actions/checkout@v4
-
-      - name: Download artifacts
-        uses: actions/download-artifact@v3
-
-      - name: Upload python coverage data
-        uses: codecov/codecov-action@v3
-        with:
-          name: UIBackend
-          fail_ci_if_error: true
-          verbose: true
-          files: ./coverage-py-1/coverage.xml,./coverage-py-2/coverage.xml,./coverage-py-3/coverage.xml
-          flags: server-ui
-
-      - name: Upload JS coverage data
-        uses: codecov/codecov-action@v3
-        with:
-          name: Cypress
-          token: ${{ secrets.CODECOV_TOKEN }}
-          fail_ci_if_error: true
-          files: ./coverage-js-1/clover.xml,./coverage-js-2/clover.xml,./coverage-js-3/clover.xml
-          verbose: true
-          flags: ui-tests
diff --git a/.releaserc b/.releaserc
@@ -1,19 +1,22 @@
 {
-	"branches": ["develop", {"name": "version-14-beta", "channel": "beta", "prerelease": true}],
+	"branches": ["version-15"],
 	"plugins": [
 		"@semantic-release/commit-analyzer", {
-			"preset": "angular"
+			"preset": "angular",
+			"releaseRules": [
+				{"breaking": true, "release": false}
+			]
 		},
 		"@semantic-release/release-notes-generator",
 		[
 			"@semantic-release/exec", {
-				"prepareCmd": 'sed -ir "s/[0-9]*\.[0-9]*\.[0-9]*/${nextRelease.version}/" frappe/__init__.py'
+				"prepareCmd": 'sed -ir -E "s/\"[0-9]+\.[0-9]+\.[0-9]+\"/\"${nextRelease.version}\"/" frappe/__init__.py'
 			}
 		],
 		[
 			"@semantic-release/git", {
 				"assets": ["frappe/__init__.py"],
-				"message": "chore(release): Bumped to Version ${nextRelease.version}"
+				"message": "chore(release): Bumped to Version ${nextRelease.version}\n\n${nextRelease.notes}"
 			}
 		],
 		"@semantic-release/github"

diff --git a/frappe/__init__.py b/frappe/__init__.py
@@ -45,7 +45,7 @@
 )
 from .utils.lazy_loader import lazy_import
 
-__version__ = "15.0.0-dev"
+__version__ = "15.0.0"
 __title__ = "Frappe Framework"
 
 controllers = {}