diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 0378f8c..2179dcc 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -43,7 +43,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@v1 + uses: github/codeql-action/init@v2 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -54,7 +54,7 @@ jobs: # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). # If this step fails, then you should remove it and run the build manually (see below) - name: Autobuild - uses: github/codeql-action/autobuild@v1 + uses: github/codeql-action/autobuild@v2 # ℹī¸ Command-line programs to run using the OS shell. # 📚 https://git.io/JvXDl @@ -68,4 +68,4 @@ jobs: # make release - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v1 + uses: github/codeql-action/analyze@v2 diff --git a/.github/workflows/debug-kube.yaml b/.github/workflows/debug-kube.yaml new file mode 100644 index 0000000..b828491 --- /dev/null +++ b/.github/workflows/debug-kube.yaml @@ -0,0 +1,32 @@ +name: Debug kube + +on: + workflow_dispatch: + push: + branches: + - "*" + +jobs: + dump: + name: Debug kubeconfig + runs-on: ubuntu-latest + steps: + - uses: azure/setup-kubectl@v3 + - name: extract kubeconfig + run: | + echo -n "${{secrets.KUBECONFIG}}" | base64 --decode > kubeconfig + - name: list kube data + run: | + KUBECONFIG=./kubeconfig kubectl config get-contexts + dump-prod: + name: Debug kubeconfig production + runs-on: ubuntu-latest + environment: production + steps: + - uses: azure/setup-kubectl@v3 + - name: extract kubeconfig + run: | + echo -n "${{secrets.KUBECONFIG}}" | base64 --decode > kubeconfig + - name: list kube data + run: | + KUBECONFIG=./kubeconfig kubectl config get-contexts diff --git a/.github/workflows/update-datagouv.yml b/.github/workflows/update-datagouv.yml deleted file mode 100644 index 787c0dc..0000000 --- a/.github/workflows/update-datagouv.yml +++ /dev/null @@ -1,54 +0,0 @@ -name: Update datagouv - -on: - workflow_dispatch: - schedule: - - cron: "0 0 * * 1" # every monday - -concurrency: - cancel-in-progress: true - group: update-datagouv - -jobs: - update-datagouv: - runs-on: ubuntu-latest - steps: - - name: Checkout repository - uses: actions/checkout@v3 - with: - token: ${{ secrets.SOCIALGROOVYBOT_BOTO_PAT }} - - - name: Download data - id: download - continue-on-error: true - run: | - sudo apt-get update - sudo apt-get install -y curl git - # download https://www.data.gouv.fr/fr/datasets/liste-des-conventions-collectives-par-entreprise-siret/ - echo "Download from data.gouv" - curl -L https://www.data.gouv.fr/fr/datasets/r/bfc3a658-c054-4ecc-ba4b-22f3f5789dc7 -o "./WEEZ.csv" - # ensure we have an entry for "renault SAS" - echo "Check validity" - cat ./WEEZ.csv | grep 78012998704037 - # check if its a new file - gunzip ./data/WEEZ.csv.gz - if [[ $(diff ./WEEZ.csv ./data/WEEZ.csv) ]]; then - echo "File changed" - gzip -v ./WEEZ.csv - gzip -t ./WEEZ.csv.gz - echo "move" - mv ./WEEZ.csv.gz ./data/WEEZ.csv.gz - exit 0 - else - echo "File not changed" - rm ./WEEZ.csv - exit 1 - fi; - - - name: Commit changes - uses: stefanzweifel/git-auto-commit-action@v4 - if: steps.download.outcome == 'success' - with: - file_pattern: "data/*" - commit_message: "fix: Update datagouv data" - commit_author: "GitHub bot " diff --git a/.kontinuous/config.yaml b/.kontinuous/config.yaml new file mode 100644 index 0000000..8d7c347 --- /dev/null +++ b/.kontinuous/config.yaml @@ -0,0 +1,7 @@ +projectName: fabrique + +dependencies: + fabrique: + extends: + - name: ovh + - name: buildkit-service diff --git a/CHANGELOG.md b/CHANGELOG.md index d4f936b..e5ed049 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +## [1.7.2](https://github.com/SocialGouv/siret2idcc/compare/v1.7.1...v1.7.2) (2023-09-18) + + +### Bug Fixes + +* upgrade docker image ([#2](https://github.com/SocialGouv/siret2idcc/issues/2)) ([28561c4](https://github.com/SocialGouv/siret2idcc/commit/28561c4725d05df4c3a153f080d1650f23de13c1)) + ## [1.7.1](https://github.com/SocialGouv/siret2idcc/compare/v1.7.0...v1.7.1) (2023-06-22) diff --git a/Dockerfile b/Dockerfile index 93f0315..96e428e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM node:18-alpine +FROM node:18-alpine3.18@sha256:982b5b6f07cd9241c9ebb163829067deac8eaefc57cfa8f31927f4b18943d971 WORKDIR /app @@ -16,4 +16,4 @@ COPY . . USER 1000 -ENTRYPOINT ["yarn", "start"] \ No newline at end of file +ENTRYPOINT ["yarn", "start"] diff --git a/data/WEEZ.csv.gz b/data/WEEZ.csv.gz index ec0c7e9..1ed666f 100644 Binary files a/data/WEEZ.csv.gz and b/data/WEEZ.csv.gz differ diff --git a/package.json b/package.json index 2ca2f8e..221b05a 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "@socialgouv/siret2idcc", "private": true, - "version": "1.7.1", + "version": "1.7.2", "description": "Retrieves the matching Convention Collective number for a French company based on its SIRET identification number", "main": "src/index.js", "repository": "https://github.com/SocialGouv/siret2idcc",