Merge pull request #46 from timoa/develop

Merge 0.4.8 pre-release to master
timoa · Mar 27, 2022 · eb03543 · eb03543
2 parents fd4b20e + 38862e7
commit eb03543
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 31 deletions.
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -16,7 +16,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579 # tag=v2
       with:
         # We must fetch at least the immediate parents so that if this is
         # a pull request then we can checkout the head.

diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml
@@ -14,10 +14,10 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579 # tag=v2
 
       - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@f1f314fca9dfce2769ece7d933488f076716723e # tag=v1
         with:
           node-version: ${{ matrix.node-version }}
 
@@ -33,7 +33,7 @@ jobs:
         run: npm run test:coverage
 
       - name: Save Code Coverage
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@82c141cc518b40d92cc801eee768e7aafc9c2fa2 # tag=v2
         with:
           name: code-coverage
           path: coverage
@@ -44,10 +44,10 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579 # tag=v2
 
       - name: Download Code Coverage
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@f023be2c48cc18debc3bacd34cb396e0295e2869 # tag=v2
         with:
           name: code-coverage
           path: coverage
@@ -66,11 +66,14 @@ jobs:
   release:
     runs-on: ubuntu-latest
     needs: tests
-    if: github.ref == 'refs/heads/develop'
+    if: contains('
+        refs/heads/master
+        refs/heads/develop
+      ', github.ref)
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@a12a3943b4bdde767164f792f33f40b04645d846 # tag=v3
 
       - name: Semantic Release
         uses: cycjimmy/semantic-release-action@v3
@@ -85,10 +88,10 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579 # tag=v2
 
       - name: Docker Build
-        uses: docker/build-push-action@v1
+        uses: docker/build-push-action@3e7a4f6646880c6f63758d73ac32392d323eaf8f # tag=v1
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -2,7 +2,7 @@ version: '3.3'
 
 services:
   api:
-    image: timoa/app-stores-prometheus-exporter:latest
+    image: timoa/app-stores-prometheus-exporter:latest@sha256:724f9351775e37c431dcf9a8f5350d488ea3e9be31ba8c2e5a26ef3d5f888d9a
     environment:
       - NODE_ENV=production
     volumes:

diff --git a/package.json b/package.json
@@ -38,12 +38,12 @@
   },
   "homepage": "https://github.com/timoa/app-stores-prometheus-exporter#readme",
   "dependencies": {
-    "app-store-scraper": "^0.16.3",
-    "google-play-scraper": "^8.0.4",
-    "prom-client": "^11.5.3",
-    "snyk": "^1.685.0",
-    "uuid": "^3.4.0",
-    "winston": "^3.3.3"
+    "app-store-scraper": "0.16.3",
+    "google-play-scraper": "8.1.0",
+    "prom-client": "11.5.3",
+    "snyk": "1.685.0",
+    "uuid": "3.4.0",
+    "winston": "3.3.3"
   },
   "engines": {
     "node": ">=8.0"
@@ -54,20 +54,20 @@
     "darwin"
   ],
   "devDependencies": {
-    "acorn": "^6.4.1",
-    "acorn-jsx": "^5.2.0",
-    "chai": "^4.2.0",
-    "chai-http": "^4.3.0",
-    "eslint": "^5.9.0",
-    "eslint-config-airbnb": "^17.1.0",
-    "eslint-plugin-import": "^2.22.0",
-    "eslint-plugin-jsx-a11y": "^6.3.1",
-    "eslint-plugin-react": "^7.20.6",
-    "espree": "^4.1.0",
-    "mocha": "^7.2.0",
-    "npm-run-all": "^4.1.5",
-    "nyc": "^15.1.0",
-    "request": "^2.88.2"
+    "acorn": "6.4.1",
+    "acorn-jsx": "5.2.0",
+    "chai": "4.2.0",
+    "chai-http": "4.3.0",
+    "eslint": "5.16.0",
+    "eslint-config-airbnb": "17.1.1",
+    "eslint-plugin-import": "2.22.0",
+    "eslint-plugin-jsx-a11y": "6.3.1",
+    "eslint-plugin-react": "7.20.6",
+    "espree": "4.1.0",
+    "mocha": "7.2.0",
+    "npm-run-all": "4.1.5",
+    "nyc": "15.1.0",
+    "request": "2.88.2"
   },
   "nyc": {
     "check-coverage": true,