feat: install old platforms on ubuntu

1CDevFlow · Nov 17, 2024 · 96d1c0c · 96d1c0c
1 parent 4410b4d
commit 96d1c0c
Show file tree

Hide file tree

Showing 7 changed files with 75 additions and 75 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -53,12 +53,14 @@ jobs:
         id: checkout
         uses: actions/checkout@v4
 
-      - name: Test Local Action
+      - name: Install 1C:Enterprise from deb-packages
         id: test-action
         uses: ./
         with:
-          milliseconds: 2000
-
-      - name: Print Output
-        id: output
-        run: echo "${{ steps.test-action.outputs.time }}"
+          type: onec
+          onec_version: 8.3.14.2095
+          cache_distr: true
+        env:
+          ONEC_USERNAME: ${{ secrets.ONEC_USERNAME }}
+          ONEC_PASSWORD: ${{ secrets.ONEC_PASSWORD }}
+        timeout-minutes: 10
diff --git a/dist/index.js b/dist/index.js
diff --git a/dist/index.js.map b/dist/index.js.map
diff --git a/src/installer.ts b/src/installer.ts
@@ -27,35 +27,26 @@ export async function run(): Promise<void> {
     throw new Error('failed to recognize the installer type')
   }
 
-  //   let installerRestoredKey: string | undefined
-  //   let installerRestored = false
-  let instalationRestoredKey: string | undefined
-  let instalationRestored = false
+  let installerRestoredKey: string | undefined
+  let installerRestored = false
+  let installationRestoredKey: string | undefined
+  let installationRestored = false
 
   if (useCache) {
-    instalationRestoredKey = await installer.restoreInstalledTool()
-    instalationRestored = instalationRestoredKey !== undefined
+    installationRestoredKey = await installer.restoreInstalledTool()
+    installationRestored = installationRestoredKey !== undefined
   }
 
-  if (instalationRestored) {
+  if (installationRestored) {
     return
   }
 
-  //   if (useCacheDistr) {
-  //     installerRestoredKey = await installer.restoreInstallationPackage()
-  //     installerRestored = installerRestoredKey !== undefined
-  //   }
+  if (useCacheDistr) {
+    installerRestoredKey = await installer.restoreInstallationPackage()
+    installerRestored = installerRestoredKey !== undefined
+  }
 
-  //   if (!installerRestored) {
-  //     const oneget = new OneGet(onegetVersion, process.platform)
-  //     await oneget.download()
-  //     await oneget.install()
-  //     await installer.download()
-  //     if (useCacheDistr) {
-  //       await installer.saveInstallerCache()
-  //     }
-  //   }
-  if (!instalationRestored) {
+  if (!installationRestored) {
     await installer.download()
     if (useCacheDistr) {
       await installer.saveInstallerCache()

diff --git a/src/tools/oneGet.ts b/src/tools/oneGet.ts
@@ -28,7 +28,7 @@ class OneGet extends OnecTool {
       platform = 'darwin'
       extension = 'tar.gz'
     }
-    const installerPath = `/tmp/${this.INSTALLER_CACHE_PRIMARY_KEY}`
+    const installerPath = this.getInstallersPath()
     await io.rmRF(installerPath)
 
     const archivePath = `${installerPath}/oneget.${extension}`
@@ -49,7 +49,7 @@ class OneGet extends OnecTool {
     } else if (this.isMac()) {
       extension = 'tar.gz'
     }
-    const onegetPath = `/tmp/${this.INSTALLER_CACHE_PRIMARY_KEY}/oneget.${extension}`
+    const onegetPath = `${this.getInstallersPath()}/oneget.${extension}`
 
     let oneGetFolder
     if (this.isWindows()) {

diff --git a/src/tools/onecTool.ts b/src/tools/onecTool.ts
@@ -44,14 +44,18 @@ export abstract class OnecTool implements IOnecTools {
     }
   }
 
+  protected getInstallersPath(): string {
+    return `/tmp/${this.INSTALLER_CACHE_PRIMARY_KEY}`
+  }
+
   protected async handleLoadedCache(): Promise<void> {
     await this.updatePath()
   }
 
   async restoreInstallationPackage(): Promise<string | undefined> {
     const primaryKey = this.computeInstallerKey()
 
-    const restorePath = `/tmp/${this.INSTALLER_CACHE_PRIMARY_KEY}`
+    const restorePath = this.getInstallersPath()
     const matchedKey = await restoreCasheByPrimaryKey([restorePath], primaryKey)
 
     await this.handleLoadedCache()
@@ -93,7 +97,7 @@ export abstract class OnecTool implements IOnecTools {
   async saveInstallerCache(): Promise<void> {
     try {
       await cache.saveCache(
-        [`/tmp/${this.INSTALLER_CACHE_PRIMARY_KEY}`],
+        [this.getInstallersPath()],
         this.computeInstallerKey()
       )
     } catch (error) {

diff --git a/src/tools/platform83.ts b/src/tools/platform83.ts
@@ -40,7 +40,7 @@ export class Platform83 extends OnecTool {
         architecture: 'x64',
         type: installerType
       },
-      `/tmp/${this.INSTALLER_CACHE_PRIMARY_KEY}`,
+      this.getInstallersPath(),
       true
     )
 
@@ -54,9 +54,9 @@ export class Platform83 extends OnecTool {
         ? 'setup-full'
         : '*.deb'
 
-    const path = `/tmp/${this.INSTALLER_CACHE_PRIMARY_KEY}`
-    const patterns = [`${path}/**/${installerPattern}*`]
-    const globber = await glob.create(patterns.join('\n'))
+    const path = this.getInstallersPath()
+
+    const globber = await glob.create(`${path}/**/${installerPattern}*`)
     const files = await globber.glob()
     core.info(`found ${files}`)
 
@@ -71,12 +71,19 @@ export class Platform83 extends OnecTool {
         'client_thin,client_thin_fib,ws'
       ])
     } else if (this.isLinux()) {
-      await exec('sudo', [
-        'dpkg',
-        '-i',
-        '--force-all',
-        `${path}/1c-enterprise83*-{common,server,thin-client,client}_*.deb`
-      ])
+      for await (const mask of ['common', 'server', 'thin-client', 'client']) {
+        const files = await (
+          await glob.create(`${path}/1c-enterprise83-${mask}_*.deb`)
+        ).glob()
+
+        if (files.length !== 0) {
+          await exec('sudo', ['dpkg', '-i', '--force-all', `${files[0]}`])
+        } else {
+          core.warning(
+            `File not found for ${mask} (mask: 1c-enterprise83-${mask}_*.deb)`
+          )
+        }
+      }
     } else if (this.isWindows()) {
       await exec(files[0], [
         '/l',