From bfb1cfa4044bf124894d6830e03b269859c44978 Mon Sep 17 00:00:00 2001 From: oleiade Date: Tue, 31 Oct 2023 17:09:07 +0100 Subject: [PATCH 1/3] Ensure GH workflow is run on push and PR --- .github/workflows/all.yml | 48 +++++++++++++++++++++++---------------- 1 file changed, 29 insertions(+), 19 deletions(-) diff --git a/.github/workflows/all.yml b/.github/workflows/all.yml index efb8a67..9e0a487 100644 --- a/.github/workflows/all.yml +++ b/.github/workflows/all.yml @@ -1,28 +1,38 @@ name: Build and test the aws jslib against a Localstack instance -on: push +on: + # Enables running the workflow manually from the Actions tab + workflow_dispatch: + + push: + branches: + - main + tags: + - v* + + pull_request: jobs: - test: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 + test: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 - - name: Install Go - uses: actions/setup-go@v2 - with: - go-version: 1.x + - name: Install Go + uses: actions/setup-go@v2 + with: + go-version: 1.x - - name: Install k6 - run: go install go.k6.io/k6@latest + - name: Install k6 + run: go install go.k6.io/k6@latest - - name: Build the stack - run: docker-compose up -d + - name: Build the stack + run: docker-compose up -d - - name: Wait for the localstack scripts to have been applied - run: sleep 30 + - name: Wait for the localstack scripts to have been applied + run: sleep 30 - - name: Install npm packages - run: npm install + - name: Install npm packages + run: npm install - - name: Test - run: npm run webpack && npm run ci-test \ No newline at end of file + - name: Test + run: npm run webpack && npm run ci-test From 6fa671384566745add6a05c3b0ebb71135c5030e Mon Sep 17 00:00:00 2001 From: oleiade Date: Fri, 17 Nov 2023 12:15:10 +0100 Subject: [PATCH 2/3] Apply suggestions from code review --- .github/workflows/all.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/all.yml b/.github/workflows/all.yml index 9e0a487..dd90499 100644 --- a/.github/workflows/all.yml +++ b/.github/workflows/all.yml @@ -15,10 +15,10 @@ jobs: test: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Install Go - uses: actions/setup-go@v2 + uses: actions/setup-go@v4 with: go-version: 1.x From 0d0ed870121a44b5171d135183c508f206f310ed Mon Sep 17 00:00:00 2001 From: oleiade Date: Fri, 17 Nov 2023 12:21:18 +0100 Subject: [PATCH 3/3] npm audit fix --- package-lock.json | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/package-lock.json b/package-lock.json index a5173e2..162036d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -96,12 +96,12 @@ } }, "node_modules/@babel/generator": { - "version": "7.23.0", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.0.tgz", - "integrity": "sha512-lN85QRR+5IbYrMWM6Y4pE/noaQtg4pNiqeNGX60eqOfo6gtEj6uw/JagelB8vVztSd7R6M5n1+PQkDbHbBRU4g==", + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.3.tgz", + "integrity": "sha512-keeZWAV4LU3tW0qRi19HRpabC/ilM0HRBBzf9/k8FFiG4KVpiv0FIy4hHfLfFQZNhziCTPTmd59zoyv6DNISzg==", "dev": true, "dependencies": { - "@babel/types": "^7.23.0", + "@babel/types": "^7.23.3", "@jridgewell/gen-mapping": "^0.3.2", "@jridgewell/trace-mapping": "^0.3.17", "jsesc": "^2.5.1" @@ -444,9 +444,9 @@ } }, "node_modules/@babel/parser": { - "version": "7.23.0", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.0.tgz", - "integrity": "sha512-vvPKKdMemU85V9WE/l5wZEmImpCtLqbnTvqDS2U1fJ96KrxoW7KrXhNsNCblQlg8Ck4b85yxdTyelsMUgFUXiw==", + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.3.tgz", + "integrity": "sha512-uVsWNvlVsIninV2prNz/3lHCb+5CJ+e+IUBfbjToAHODtfGYLfCFuY4AU7TskI+dAKk+njsPiBjq1gKTvZOBaw==", "dev": true, "bin": { "parser": "bin/babel-parser.js" @@ -1751,19 +1751,19 @@ } }, "node_modules/@babel/traverse": { - "version": "7.23.0", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.0.tgz", - "integrity": "sha512-t/QaEvyIoIkwzpiZ7aoSKK8kObQYeF7T2v+dazAYCb8SXtp58zEVkWW7zAnju8FNKNdr4ScAOEDmMItbyOmEYw==", + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.3.tgz", + "integrity": "sha512-+K0yF1/9yR0oHdE0StHuEj3uTPzwwbrLGfNOndVJVV2TqA5+j3oljJUb4nmB954FLGjNem976+B+eDuLIjesiQ==", "dev": true, "dependencies": { "@babel/code-frame": "^7.22.13", - "@babel/generator": "^7.23.0", + "@babel/generator": "^7.23.3", "@babel/helper-environment-visitor": "^7.22.20", "@babel/helper-function-name": "^7.23.0", "@babel/helper-hoist-variables": "^7.22.5", "@babel/helper-split-export-declaration": "^7.22.6", - "@babel/parser": "^7.23.0", - "@babel/types": "^7.23.0", + "@babel/parser": "^7.23.3", + "@babel/types": "^7.23.3", "debug": "^4.1.0", "globals": "^11.1.0" }, @@ -1772,9 +1772,9 @@ } }, "node_modules/@babel/types": { - "version": "7.23.0", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.0.tgz", - "integrity": "sha512-0oIyUfKoI3mSqMvsxBdclDwxXKXAUA8v/apZbc+iSyARYou1o8ZGDxbUYyLFoW2arqS2jDGqJuZvv1d/io1axg==", + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.3.tgz", + "integrity": "sha512-OZnvoH2l8PK5eUvEcUyCt/sXgr/h+UWpVuBbOljwcrAgUl6lpchoQ++PHGyQy1AtYnVA6CEq3y5xeEI10brpXw==", "dev": true, "dependencies": { "@babel/helper-string-parser": "^7.22.5",