try add amz linux

Signed-off-by: Yury-Fridlyand <yury.fridlyand@improving.com>
Yury-Fridlyand · Sep 20, 2024 · aaa39b5 · aaa39b5
1 parent 88949ce
commit aaa39b5
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 57 deletions.
diff --git a/.github/json_matrices/build-matrix.json b/.github/json_matrices/build-matrix.json
@@ -59,4 +59,14 @@
         "PACKAGE_MANAGERS": ["npm"],
         "languages": ["node"]
     }
+    {
+        "OS": "ubuntu",
+        "NAMED_OS": "linux",
+        "RUNNER": "ubuntu-latest",
+        "ARCH": "x64",
+        "TARGET": "x86_64-unknown-linux-gnu",
+        "IMAGE": "amazonlinux:latest",
+        "CONTAINER_OPTIONS": "",
+        "languages": ["python", "node", "java", "go", "csharp"]
+    },
 ]
diff --git a/.github/json_matrices/engine-matrix.json b/.github/json_matrices/engine-matrix.json
@@ -6,6 +6,6 @@
     {
         "type": "redis",
         "version": "6.2",
-        "run": "// always"
+        "run": "always"
     }
 ]
diff --git a/.github/workflows/node.yml b/.github/workflows/node.yml
@@ -208,59 +208,9 @@ jobs:
 #                      node/test-report*.html
 #                      utils/clusters/**
 #                      benchmarks/results/**
-#
-#    build-and-test-linux-musl-on-x86:
-#        if: (github.repository_owner == 'valkey-io' && github.event_name == 'schedule' || github.event_name == 'workflow_dispatch' && github.event.inputs.full-matrix == 'true')
-#        name: Build and test Node wrapper on Linux musl
-#        runs-on: ubuntu-latest
-#        container:
-#            image: node:alpine
-#            options: --user root --privileged
-#
-#        steps:
-#            - name: Install git
-#              run: |
-#                  apk update
-#                  apk add git
-#
-#            - uses: actions/checkout@v4
-#              with:
-#                  submodules: recursive
-#
-#            - name: Setup musl on Linux
-#              uses: ./.github/workflows/setup-musl-on-linux
-#              with:
-#                  workspace: $GITHUB_WORKSPACE
-#                  npm-scope: ${{ secrets.NPM_SCOPE }}
-#                  npm-auth-token: ${{ secrets.NPM_AUTH_TOKEN }}
-#
-#            - name: Build Node wrapper
-#              uses: ./.github/workflows/build-node-wrapper
-#              with:
-#                  os: ubuntu
-#                  named_os: linux
-#                  arch: x64
-#                  target: x86_64-unknown-linux-musl
-#                  github-token: ${{ secrets.GITHUB_TOKEN }}
-#                  engine-version: "7.2.5"
-#
-#            - name: test
-#              run: npm test
-#              working-directory: ./node
-#
-#            - name: Upload test reports
-#              if: always()
-#              continue-on-error: true
-#              uses: actions/upload-artifact@v4
-#              with:
-#                  name: test-report-node-linux-musl
-#                  path: |
-#                      node/test-report*.html
-#                      utils/clusters/**
-#                      benchmarks/results/**
 #
 
-    get-matrices-containers:
+    get-containers:
         runs-on: ubuntu-latest
         # using `needs` instead of `if` to ensure that same condition applied
         needs: [get-matrices]
@@ -282,23 +232,24 @@ jobs:
 
     test-node-musl:
         runs-on: ${{ matrix.host.RUNNER }}
-        needs: [get-matrices-containers]
+        needs: [get-containers]
 #        if: ${{ contains(matrix.host.TARGET, 'musl') }}
         timeout-minutes: 25
         strategy:
             fail-fast: false
             matrix:
-                engine: ${{ fromJson(needs.get-matrices-containers.outputs.engine-matrix-output) }}
-                host: ${{ fromJson(needs.get-matrices-containers.outputs.host-matrix-output) }}
-                node: ${{ fromJson(needs.get-matrices-containers.outputs.version-matrix-output) }}
+                engine: ${{ fromJson(needs.get-containers.outputs.engine-matrix-output) }}
+                host: ${{ fromJson(needs.get-containers.outputs.host-matrix-output) }}
+                node: ${{ fromJson(needs.get-containers.outputs.version-matrix-output) }}
         container:
             image: ${{ matrix.host.IMAGE }}
             options: ${{ matrix.host.CONTAINER_OPTIONS }}
+        name: pewpew
         steps:
             - name: log
               run: |
                   echo "${{ toJson(matrix.host) }}"
-
+        
             - name: Install git
               run: |
                   apk update