diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 23f3e83..17dc0e7 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -2,37 +2,34 @@ name: Docker Image CI on: push: - branches: - - 'master' - tags: - - 'v*' + branches: ["main"] + tags: ["v*"] pull_request: - branches: - - 'master' + branches: ["main"] jobs: - docker: + build: runs-on: ubuntu-latest + steps: - - - name: Checkout - uses: actions/checkout@v2 - - - name: Docker meta + - name: Checkout + uses: actions/checkout@v4 + + - name: Docker metadata id: meta - uses: docker/metadata-action@v3 + uses: docker/metadata-action@v5 with: images: ${{ secrets.DOCKERHUB_TEMPLATE }} - - - name: Login to DockerHub + + - name: Login to DockerHub if: github.event_name != 'pull_request' - uses: docker/login-action@v1 + uses: docker/login-action@v3 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - - - name: Build and push - uses: docker/build-push-action@v2 + + - name: Build and push + uses: docker/build-push-action@v5 with: context: . push: ${{ github.event_name != 'pull_request' }} diff --git a/package.json b/package.json index 75c5ab3..b1658e6 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,7 @@ }, "dependencies": { "async-mqtt": "^2.6.2", - "convict": "^6.2.2", + "convict": "^6.2.4", "debug": "^4.3.4", "dotenv": "^16.0.0" } diff --git a/yarn.lock b/yarn.lock index b20a7bf..6587ea6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -224,10 +224,10 @@ concat-stream@^2.0.0: readable-stream "^3.0.2" typedarray "^0.0.6" -convict@^6.2.2: - version "6.2.2" - resolved "https://registry.yarnpkg.com/convict/-/convict-6.2.2.tgz#8168abe41d45b4f5ecd6e249c02553c0612a31af" - integrity sha512-3MsROJiEFN3BAzeFit1t87t7EUFzd44MNd13MLSikV2dsnDl7znwKgtYPPONtnDzxiDW0nBAsxVhSRNrjUrTTg== +convict@^6.2.4: + version "6.2.4" + resolved "https://registry.yarnpkg.com/convict/-/convict-6.2.4.tgz#be290672bf6397eec808d3b11fc5f71785b02a4b" + integrity sha512-qN60BAwdMVdofckX7AlohVJ2x9UvjTNoKVXCL2LxFk1l7757EJqf1nySdMkPQer0bt8kQ5lQiyZ9/2NvrFBuwQ== dependencies: lodash.clonedeep "^4.5.0" yargs-parser "^20.2.7" @@ -1254,9 +1254,9 @@ safe-buffer@~5.2.0: integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== semver@^5.5.0, semver@^5.5.1: - version "5.7.1" - resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" - integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== + version "5.7.2" + resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.2.tgz#48d55db737c3287cd4835e17fa13feace1c41ef8" + integrity sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g== shebang-command@^1.2.0: version "1.2.0"