Improve builds

Merge in ADGUARD-FILTERS/aglint from fix-builds to master Squashed commit of the following: commit b66d24d Author: scripthunter7 <[email protected]> Date: Tue Jan 9 15:35:56 2024 +0100 Update changelog commit d6c3f54 Author: scripthunter7 <[email protected]> Date: Tue Jan 9 15:34:48 2024 +0100 Update yarn arg handling in test specs as well commit 70b7978 Author: scripthunter7 <[email protected]> Date: Tue Jan 9 14:58:36 2024 +0100 Fix nit commit 056a2fe Author: scripthunter7 <[email protected]> Date: Tue Jan 9 13:53:26 2024 +0100 Update GH release workflow commit f1a66d2 Author: scripthunter7 <[email protected]> Date: Tue Jan 9 13:49:21 2024 +0100 Finish Bamboo specs commit 38e5215 Author: scripthunter7 <[email protected]> Date: Tue Jan 9 13:48:24 2024 +0100 Use tsx instead of ts-node to build txt
AdguardTeam · Jan 9, 2024 · 0439668 · 0439668
1 parent aee21db
commit 0439668
Show file tree

Hide file tree

Showing 10 changed files with 298 additions and 42 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -1,36 +1,25 @@
-name: Release
+name: Create GitHub Release
 
 env:
   NODE_VERSION: 18
 
-# Workflow need write access to the repository to create
-# a GitHub release
-permissions:
-  contents: write
-
 on:
   push:
     tags:
       - v*
-  # Make possible to run manually
-  workflow_dispatch:
-    inputs:
-      # warn before running manually
-      warning:
-        description: 'Should be run only for tags like `v*`'
-        required: false
-        type: boolean
-
-# Make sure that only one release workflow runs at a time.
+
+# Workflow need write access to the repository to create a release
+permissions:
+  contents: write
+
+# Make sure that only one release workflow runs at a time
 concurrency:
   group: release
 
 jobs:
   release:
-    name: Create NPM and GitHub release
+    name: Create GitHub release
     runs-on: ubuntu-latest
-    # Only run this job for v* tags
-    if: startsWith(github.ref, 'refs/tags/v')
     steps:
       - name: Check out the repository
         uses: actions/checkout@v3
@@ -63,11 +52,6 @@ jobs:
       - name: Pack files
         run: yarn pack --filename aglint.tgz
 
-      - name: Publish to NPM
-        run: yarn publish aglint.tgz --access=public --non-interactive
-        env:
-          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
-
       - name: Release on GitHub
         uses: softprops/action-gh-release@v1
         with:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,12 +5,13 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog][keepachangelog], and this project adheres to [Semantic Versioning][semver].
 
 
-## [2.0.7] - 2024-01-09
+## [2.0.8] - 2024-01-09
 
 ### Fixed
 
 - Absolute paths in the CLI [#184].
 
+
 ## [2.0.6] - 2023-11-07
 
 ### Added
@@ -157,7 +158,7 @@ The format is based on [Keep a Changelog][keepachangelog], and this project adhe
 - Initial version of the adblock rule parser.
 
 
-[2.0.7]: https://github.com/AdguardTeam/AGLint/compare/v2.0.6...v2.0.7
+[2.0.8]: https://github.com/AdguardTeam/AGLint/compare/v2.0.6...v2.0.8
 [2.0.6]: https://github.com/AdguardTeam/AGLint/compare/v2.0.5...v2.0.6
 [2.0.5]: https://github.com/AdguardTeam/AGLint/compare/v2.0.4...v2.0.5
 [2.0.4]: https://github.com/AdguardTeam/AGLint/compare/v2.0.3...v2.0.4

diff --git a/bamboo-specs/bamboo.yaml b/bamboo-specs/bamboo.yaml
@@ -6,3 +6,9 @@
 
 ---
 !include 'build.yaml'
+
+---
+!include 'deploy.yaml'
+
+---
+!include 'permissions.yaml'
diff --git a/bamboo-specs/build.yaml b/bamboo-specs/build.yaml
@@ -5,7 +5,7 @@ plan:
   key: AGLINTBUILD
   name: aglint - build release
 variables:
-  dockerNode: adguard/node-ssh:18.13--0
+  dockerNode: adguard/node-ssh:18.13--1
 
 stages:
   - Build:
@@ -29,17 +29,34 @@ Build:
         interpreter: SHELL
         scripts:
           - |-
-            set -x
             set -e
-            ls -al
+            set -x
+
+            # Fix mixed logs
+            exec 2>&1
+
+            ls -laht
+
+            # Exclude '--ignore-platform' from yarn arguments to fix build
+            # This is needed for installing swc core optional dependencies properly
+            originalYarnArgs="$bamboo_varsYarn"
+            modifiedYarnArgs=$(echo "$originalYarnArgs" | sed 's/--ignore-platform//g')
 
-            # Install common dependencies
-            # swc core optional dependencies are needed for tests
-            # but `--ignore-optional` will not install them
-            # so we run `yarn install ${bamboo.varsYarn}` without `--ignore-optional`:
-            yarn install --silent --ignore-engines --ignore-platform --ignore-scripts
+            # Install dependencies
+            yarn install ${modifiedYarnArgs}
 
-            yarn build-txt
+            # Run checks
+            yarn check-types
+            yarn lint
+            yarn test
+
+            # Create build, this will also create build.txt file with build number
+            yarn build
+
+            # Pack build into tarball
+            yarn pack --filename aglint.tgz
+
+            ls -laht
 
             rm -rf node_modules
     - inject-variables:
@@ -51,6 +68,11 @@ Build:
         configuration:
           selectedRepository: defaultRepository
           tagName: v${bamboo.inject.version}
+  artifacts:
+    - name: aglint.tgz
+      pattern: aglint.tgz
+      shared: true
+      required: true
   requirements:
     - adg-docker: true
 
@@ -68,6 +90,8 @@ notifications:
       - webhook:
           name: Build webhook
           url: http://prod.jirahub.service.eu.consul/v1/webhook/bamboo
+
 labels: []
+
 other:
   concurrent-build-plugin: system-default
diff --git a/bamboo-specs/deploy.yaml b/bamboo-specs/deploy.yaml
@@ -0,0 +1,45 @@
+---
+version: 2
+deployment:
+  name: aglint - deploy
+  source-plan: AJL-AGLINTBUILD
+release-naming: ${bamboo.inject.version}
+environments:
+  - npmjs
+
+npmjs:
+  docker:
+    image: adguard/node-ssh:18.13--1
+    volumes:
+      ${system.YARN_DIR}: "${bamboo.cacheYarn}"
+  triggers: []
+  tasks:
+    - checkout:
+        force-clean-build: 'true'
+    - artifact-download:
+        artifacts:
+          - name: aglint.tgz
+    - script:
+        interpreter: SHELL
+        scripts:
+          - |-
+            set -e
+            set -x
+
+            # Fix mixed logs
+            exec 2>&1
+
+            ls -laht
+
+            export NPM_TOKEN=${bamboo.npmSecretToken}
+            echo "//registry.npmjs.org/:_authToken=${NPM_TOKEN}" > .npmrc
+            npm publish aglint.tgz --access public
+  requirements:
+    - adg-docker: 'true'
+  notifications:
+    - events:
+        - deployment-started-and-finished
+      recipients:
+        - webhook:
+            name: Deploy webhook
+            url: http://prod.jirahub.service.eu.consul/v1/webhook/bamboo
diff --git a/bamboo-specs/increment.yaml b/bamboo-specs/increment.yaml
@@ -5,7 +5,7 @@ plan:
   key: AGLINTINCR
   name: aglint - increment
 variables:
-  dockerNode: adguard/node-ssh:18.13--0
+  dockerNode: adguard/node-ssh:18.13--1
 
 stages:
   - Increment:

diff --git a/bamboo-specs/permissions.yaml b/bamboo-specs/permissions.yaml
@@ -0,0 +1,17 @@
+---
+version: 2
+deployment:
+  name: aglint - deploy
+deployment-permissions:
+  - groups:
+      - extensions-developers
+      - adguard-qa
+    permissions:
+      - view
+environment-permissions:
+  - npmjs:
+      - groups:
+          - extensions-developers
+        permissions:
+          - view
+          - deploy
diff --git a/bamboo-specs/test.yaml b/bamboo-specs/test.yaml
@@ -5,7 +5,7 @@ plan:
   key: AGLINTTEST
   name: aglint - tests
 variables:
-  dockerNode: adguard/node-ssh:18.13--0
+  dockerNode: adguard/node-ssh:18.13--1
 
 stages:
   - Build:
@@ -29,14 +29,21 @@ Build:
           - |-
             set -e
             set -x
+
             # Fix mixed logs
             exec 2>&1
 
-            # swc core optional dependencies are needed for tests
-            # but `--ignore-optional` will not install them
-            # so we run `yarn install ${bamboo.varsYarn}` without `--ignore-optional`:
-            yarn install --silent --ignore-engines --ignore-platform --ignore-scripts
+            ls -laht
+
+            # Exclude '--ignore-platform' from yarn arguments to fix build
+            # This is needed for installing swc core optional dependencies properly
+            originalYarnArgs="$bamboo_varsYarn"
+            modifiedYarnArgs=$(echo "$originalYarnArgs" | sed 's/--ignore-platform//g')
+
+            # Install dependencies
+            yarn install ${modifiedYarnArgs}
 
+            # Run checks
             yarn check-types
             yarn lint
             yarn test

diff --git a/package.json b/package.json
@@ -36,7 +36,7 @@
     "scripts": {
         "build": "yarn clean && yarn build-txt && yarn build-types && yarn rollup --config rollup.config.ts --configPlugin @rollup/plugin-json --configPlugin @rollup/plugin-typescript && yarn clean-types",
         "build-types": "tsc --declaration --emitDeclarationOnly --outdir dist/types",
-        "build-txt": "ts-node-esm tasks/build-txt.ts",
+        "build-txt": "tsx tasks/build-txt.ts",
         "check-types": "tsc --noEmit",
         "clean": "rimraf dist",
         "clean-types": "rimraf dist/types",
@@ -83,6 +83,7 @@
         "rollup-plugin-node-externals": "^6.1.1",
         "rollup-plugin-polyfill-node": "^0.12.0",
         "ts-node": "^10.9.1",
+        "tsx": "^4.7.0",
         "typescript": "^4.9.5"
     },
     "dependencies": {