diff --git a/.github/workflows/beta.yml b/.github/workflows/beta.yml index 0caa4b759..e1839b017 100644 --- a/.github/workflows/beta.yml +++ b/.github/workflows/beta.yml @@ -7,6 +7,7 @@ on: branches: [beta] jobs: + # Build amd64 + 386 containers images build-containers: strategy: @@ -132,8 +133,6 @@ jobs: steps: - name: Checkout source code uses: actions/checkout@v3 - with: - submodules: recursive - name: Get VERSION id: getversion run: echo "version=$(cat src/VERSION | tr -d '\n')" >> "$GITHUB_OUTPUT" @@ -146,8 +145,7 @@ jobs: needs: [create-arm, wait-builds] strategy: matrix: - image: - [bunkerweb, bunkerweb-scheduler, bunkerweb-autoconf, bunkerweb-ui] + image: [bunkerweb, bunkerweb-scheduler, bunkerweb-autoconf, bunkerweb-ui] include: - release: beta - image: bunkerweb @@ -283,3 +281,5 @@ jobs: SCW_SECRET_KEY: ${{ secrets.SCW_SECRET_KEY }} SCW_DEFAULT_PROJECT_ID: ${{ secrets.SCW_DEFAULT_PROJECT_ID }} SCW_DEFAULT_ORGANIZATION_ID: ${{ secrets.SCW_DEFAULT_ORGANIZATION_ID }} + + diff --git a/.github/workflows/container-build.yml b/.github/workflows/container-build.yml index c6e0f7540..975eb9da7 100644 --- a/.github/workflows/container-build.yml +++ b/.github/workflows/container-build.yml @@ -50,8 +50,6 @@ jobs: # Prepare - name: Checkout source code uses: actions/checkout@v3 - with: - submodules: recursive - name: Setup SSH for ARM node if: inputs.CACHE_SUFFIX == 'arm' run: | diff --git a/.github/workflows/create-arm.yml b/.github/workflows/create-arm.yml index adea7c1d9..b574d7679 100644 --- a/.github/workflows/create-arm.yml +++ b/.github/workflows/create-arm.yml @@ -35,8 +35,6 @@ jobs: # Prepare - name: Checkout source code uses: actions/checkout@v3 - with: - submodules: recursive - name: Create ARM VM id: scw uses: scaleway/action-scw@bbcfd65cd2af73456ce439088e0d42c1657c4c38 @@ -74,3 +72,4 @@ jobs: run: ssh root@$SSH_IP "curl -fsSL https://test.docker.com -o test-docker.sh ; sh test-docker.sh" env: SSH_IP: ${{ fromJson(steps.scw.outputs.json).public_ip.address }} + diff --git a/.github/workflows/dev-update-mmdb.yml b/.github/workflows/dev-update-mmdb.yml index 85698bf73..98d32b288 100644 --- a/.github/workflows/dev-update-mmdb.yml +++ b/.github/workflows/dev-update-mmdb.yml @@ -17,7 +17,6 @@ jobs: fetch-depth: 0 token: ${{ secrets.BUNKERBOT_TOKEN }} ref: dev - submodules: recursive - name: Download mmdb files run: | mkdir -p src/bw/misc/ diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml index d898a75ef..d468e6ba3 100644 --- a/.github/workflows/dev.yml +++ b/.github/workflows/dev.yml @@ -47,8 +47,6 @@ jobs: steps: - name: Checkout repository uses: actions/checkout@v3 - with: - submodules: recursive - name: Initialize CodeQL uses: github/codeql-action/init@v2 with: @@ -76,8 +74,6 @@ jobs: steps: - name: Checkout repository uses: actions/checkout@v3 - with: - submodules: recursive - id: set-matrix run: | tests=$(find ./tests/core/ -maxdepth 1 -mindepth 1 -type d -printf "%f\n" | jq -c --raw-input --slurp 'split("\n")| .[0:-1]') diff --git a/.github/workflows/doc-to-pdf.yml b/.github/workflows/doc-to-pdf.yml index f345c0324..aeaff9e04 100644 --- a/.github/workflows/doc-to-pdf.yml +++ b/.github/workflows/doc-to-pdf.yml @@ -14,12 +14,10 @@ jobs: # Prepare - name: Checkout source code uses: actions/checkout@v3 - with: - submodules: recursive - name: Install Python uses: actions/setup-python@v4 with: - python-version: "3.10" + python-version: '3.10' - name: Install doc requirements run: pip install -r docs/requirements.txt - name: Install chromium @@ -38,3 +36,4 @@ jobs: with: name: BunkerWeb_documentation_v${{ inputs.VERSION }}.pdf path: BunkerWeb_documentation_v${{ inputs.VERSION }}.pdf + diff --git a/.github/workflows/linux-build.yml b/.github/workflows/linux-build.yml index ad6983603..5eaea0c4a 100644 --- a/.github/workflows/linux-build.yml +++ b/.github/workflows/linux-build.yml @@ -42,22 +42,20 @@ jobs: # Prepare - name: Checkout source code uses: actions/checkout@v3 - with: - submodules: recursive - name: Extract arch - run: | + run : | echo "ARCH=${{ env.PLATFORMS }}" | sed 's/linux//g' | sed 's@/@@g' >> "$GITHUB_ENV" env: PLATFORMS: ${{ inputs.PLATFORMS }} - name: Extract linux arch if: inputs.PACKAGE == 'rpm' - run: | + run : | echo "LARCH=${{ env.ARCH }}" | sed 's/amd64/x86_64/g' | sed 's/arm64/aarch64/g' >> "$GITHUB_ENV" env: ARCH: ${{ env.ARCH }} - name: Extract linux arch if: inputs.PACKAGE == 'deb' - run: | + run : | echo "LARCH=${{ env.ARCH }}" >> "$GITHUB_ENV" env: ARCH: ${{ env.ARCH }} diff --git a/.github/workflows/push-doc.yml b/.github/workflows/push-doc.yml index 0a46cd6a7..c5802149c 100644 --- a/.github/workflows/push-doc.yml +++ b/.github/workflows/push-doc.yml @@ -22,14 +22,13 @@ jobs: with: fetch-depth: 0 token: ${{ secrets.BUNKERBOT_TOKEN }} - submodules: recursive - name: Setup git user run: | git config --global user.name "BunkerBot" git config --global user.email "bunkerbot@bunkerity.com" - uses: actions/setup-python@v4 with: - python-version: "3.10" + python-version: '3.10' - name: Install doc requirements run: pip install -r docs/requirements.txt - name: Push doc diff --git a/.github/workflows/push-docker.yml b/.github/workflows/push-docker.yml index 6f9dc941b..64838a77b 100644 --- a/.github/workflows/push-docker.yml +++ b/.github/workflows/push-docker.yml @@ -31,8 +31,6 @@ jobs: # Prepare - name: Check out repository code uses: actions/checkout@v3 - with: - submodules: recursive - name: Login to Docker Hub uses: docker/login-action@v2 with: diff --git a/.github/workflows/push-github.yml b/.github/workflows/push-github.yml index d535e8802..3490143ef 100644 --- a/.github/workflows/push-github.yml +++ b/.github/workflows/push-github.yml @@ -16,8 +16,6 @@ jobs: steps: # Checkout - uses: actions/checkout@v3 - with: - submodules: recursive # Get PDF doc - name: Get documentation uses: actions/download-artifact@v3 @@ -62,3 +60,4 @@ jobs: tag_name: v${{ inputs.VERSION }} discussion_category_name: Announcements files: BunkerWeb_documentation_v${{ inputs.VERSION }}.pdf + diff --git a/.github/workflows/push-packagecloud.yml b/.github/workflows/push-packagecloud.yml index 2efddafec..135203a59 100644 --- a/.github/workflows/push-packagecloud.yml +++ b/.github/workflows/push-packagecloud.yml @@ -41,8 +41,6 @@ jobs: # Prepare - name: Check out repository code uses: actions/checkout@v3 - with: - submodules: recursive - name: Install ruby uses: ruby/setup-ruby@v1 with: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ab7a9cd2a..830166ddf 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -7,6 +7,7 @@ on: branches: [master] jobs: + # Build amd64 + 386 containers images build-containers: strategy: @@ -132,8 +133,6 @@ jobs: steps: - name: Checkout source code uses: actions/checkout@v3 - with: - submodules: recursive - name: Get VERSION id: getversion run: echo "version=$(cat src/VERSION | tr -d '\n')" >> "$GITHUB_OUTPUT" @@ -146,8 +145,7 @@ jobs: needs: [create-arm, wait-builds] strategy: matrix: - image: - [bunkerweb, bunkerweb-scheduler, bunkerweb-autoconf, bunkerweb-ui] + image: [bunkerweb, bunkerweb-scheduler, bunkerweb-autoconf, bunkerweb-ui] include: - release: latest - image: bunkerweb @@ -282,4 +280,4 @@ jobs: SCW_ACCESS_KEY: ${{ secrets.SCW_ACCESS_KEY }} SCW_SECRET_KEY: ${{ secrets.SCW_SECRET_KEY }} SCW_DEFAULT_PROJECT_ID: ${{ secrets.SCW_DEFAULT_PROJECT_ID }} - SCW_DEFAULT_ORGANIZATION_ID: ${{ secrets.SCW_DEFAULT_ORGANIZATION_ID }} + SCW_DEFAULT_ORGANIZATION_ID: ${{ secrets.SCW_DEFAULT_ORGANIZATION_ID }} \ No newline at end of file diff --git a/.github/workflows/rm-arm.yml b/.github/workflows/rm-arm.yml index 5f6a388c0..feac21de5 100644 --- a/.github/workflows/rm-arm.yml +++ b/.github/workflows/rm-arm.yml @@ -22,8 +22,6 @@ jobs: # Prepare - name: Checkout source code uses: actions/checkout@v3 - with: - submodules: recursive - name: Delete ARM VM uses: scaleway/action-scw@bbcfd65cd2af73456ce439088e0d42c1657c4c38 with: @@ -32,4 +30,4 @@ jobs: access-key: ${{ secrets.SCW_ACCESS_KEY }} secret-key: ${{ secrets.SCW_SECRET_KEY }} default-project-id: ${{ secrets.SCW_DEFAULT_PROJECT_ID }} - default-organization-id: ${{ secrets.SCW_DEFAULT_ORGANIZATION_ID }} + default-organization-id: ${{ secrets.SCW_DEFAULT_ORGANIZATION_ID }} \ No newline at end of file diff --git a/.github/workflows/staging-create-infra.yml b/.github/workflows/staging-create-infra.yml index 18f254129..bb4e06008 100644 --- a/.github/workflows/staging-create-infra.yml +++ b/.github/workflows/staging-create-infra.yml @@ -20,8 +20,6 @@ jobs: if: inputs.TYPE != 'k8s' - name: Checkout source code uses: actions/checkout@v3 - with: - submodules: recursive - name: Install terraform uses: hashicorp/setup-terraform@v2 - name: Install kubectl diff --git a/.github/workflows/staging-delete-infra.yml b/.github/workflows/staging-delete-infra.yml index bed1df42f..960af0f5f 100644 --- a/.github/workflows/staging-delete-infra.yml +++ b/.github/workflows/staging-delete-infra.yml @@ -18,8 +18,6 @@ jobs: # Prepare - name: Checkout source code uses: actions/checkout@v3 - with: - submodules: recursive - name: Install terraform uses: hashicorp/setup-terraform@v2 - uses: actions/download-artifact@v3 diff --git a/.github/workflows/staging-tests.yml b/.github/workflows/staging-tests.yml index 3071e7ffb..5248e340e 100644 --- a/.github/workflows/staging-tests.yml +++ b/.github/workflows/staging-tests.yml @@ -26,8 +26,6 @@ jobs: # Prepare - name: Checkout source code uses: actions/checkout@v3 - with: - submodules: recursive - name: Login to private repository uses: docker/login-action@v2 with: diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml index 58d50227e..072b009cf 100644 --- a/.github/workflows/staging.yml +++ b/.github/workflows/staging.yml @@ -7,6 +7,7 @@ on: branches: [staging] jobs: + # Build Docker images build-containers: strategy: @@ -76,8 +77,6 @@ jobs: steps: - name: Checkout repository uses: actions/checkout@v3 - with: - submodules: recursive - name: Initialize CodeQL uses: github/codeql-action/init@v2 with: @@ -136,8 +135,6 @@ jobs: steps: - name: Checkout repository uses: actions/checkout@v3 - with: - submodules: recursive - id: set-matrix run: | tests=$(find ./tests/core/ -maxdepth 1 -mindepth 1 -type d -printf "%f\n" | jq -c --raw-input --slurp 'split("\n")| .[0:-1]') @@ -169,4 +166,4 @@ jobs: with: TYPE: ${{ matrix.type }} secrets: - CICD_SECRETS: ${{ secrets.CICD_SECRETS }} + CICD_SECRETS: ${{ secrets.CICD_SECRETS }} \ No newline at end of file diff --git a/.github/workflows/test-core.yml b/.github/workflows/test-core.yml index 03276d53e..0433b44f1 100644 --- a/.github/workflows/test-core.yml +++ b/.github/workflows/test-core.yml @@ -21,8 +21,6 @@ jobs: # Prepare - name: Checkout source code uses: actions/checkout@v3 - with: - submodules: recursive - name: Login to private repository uses: docker/login-action@v2 with: @@ -39,4 +37,4 @@ jobs: cd ./tests/core/${{ inputs.TEST }} find . -type f -name 'docker-compose.*' -exec sed -i "s@bunkerity/bunkerweb:.*@bunkerweb-tests@" {} \; find . -type f -name 'docker-compose.*' -exec sed -i "s@bunkerity/bunkerweb-scheduler:.*@scheduler-tests@" {} \; - ./test.sh + ./test.sh \ No newline at end of file diff --git a/.github/workflows/tests-ui.yml b/.github/workflows/tests-ui.yml index a2577fbb8..93125bd4b 100644 --- a/.github/workflows/tests-ui.yml +++ b/.github/workflows/tests-ui.yml @@ -18,8 +18,6 @@ jobs: # Prepare - name: Checkout source code uses: actions/checkout@v3 - with: - submodules: recursive - name: Login to private repository uses: docker/login-action@v2 with: