diff --git a/.editorconfig b/.editorconfig index d07c2650..1a5116e5 100644 --- a/.editorconfig +++ b/.editorconfig @@ -11,6 +11,9 @@ trim_trailing_whitespace = true [*.json] indent_size = 2 +[*.yaml] +indent_size = 4 + [*.md] max_line_length = off trim_trailing_whitespace = false diff --git a/.github/workflows/ci_merge_main.yaml b/.github/workflows/ci_merge_main.yaml index 9e23334f..0622d976 100644 --- a/.github/workflows/ci_merge_main.yaml +++ b/.github/workflows/ci_merge_main.yaml @@ -39,12 +39,12 @@ jobs: - name: Semver release shell: bash run: | - git config user.email "super_bot@juspay.in" - git config user.name "Superposition Bot" - cog bump --auto --skip-ci-override "[skip ci]" + git config user.email "super_bot@juspay.in" + git config user.name "Superposition Bot" + cog bump --auto --skip-ci-override "[skip ci]" - name: Push code to main shell: bash run: | - git push origin main - git push origin --tags + git push origin main + git push origin --tags diff --git a/.github/workflows/nix.yaml b/.github/workflows/nix.yaml index 8dc41b57..5cf4bc55 100644 --- a/.github/workflows/nix.yaml +++ b/.github/workflows/nix.yaml @@ -1,24 +1,24 @@ name: "CI Nix" on: - # Run only when pushing to main branch, and making PRs - push: - branches: - - main - pull_request: + # Run only when pushing to main branch, and making PRs + push: + branches: + - main + pull_request: jobs: - build: - runs-on: ${{ matrix.os }} - strategy: - matrix: - os: [ubuntu-latest, macos-14] - steps: - - uses: actions/checkout@v4 - - uses: DeterminateSystems/nix-installer-action@main - with: - extra-conf: | - trusted-public-keys = cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g= cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= - substituters = https://cache.garnix.io?priority=41 https://cache.nixos.org/ - - uses: yaxitech/nix-install-pkgs-action@v3 - with: - packages: "github:srid/nixci" - - run: nixci build \ No newline at end of file + build: + runs-on: ${{ matrix.os }} + strategy: + matrix: + os: [ubuntu-latest, macos-14] + steps: + - uses: actions/checkout@v4 + - uses: DeterminateSystems/nix-installer-action@main + with: + extra-conf: | + trusted-public-keys = cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g= cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= + substituters = https://cache.garnix.io?priority=41 https://cache.nixos.org/ + - uses: yaxitech/nix-install-pkgs-action@v3 + with: + packages: "github:srid/nixci" + - run: nixci build