Skip to content

Commit

Permalink
Merge pull request #1684 from gluwa/merge-dev-into-testnet
Browse files Browse the repository at this point in the history
Merge dev into testnet
  • Loading branch information
atodorov authored Aug 13, 2024
2 parents 39d399a + 4f88793 commit d8c4376
Show file tree
Hide file tree
Showing 119 changed files with 5,050 additions and 6,905 deletions.
5 changes: 5 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,11 @@ updates:
schedule:
interval: "monthly"

- package-ecosystem: "cargo"
directory: "/runtime/generate-bags"
schedule:
interval: "monthly"

- package-ecosystem: "cargo"
directory: "/sha3pow"
schedule:
Expand Down
5 changes: 5 additions & 0 deletions .github/runner.bicep
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ param vmName string = toLower('github-runner-${uniqueString(resourceGroup().id,
@description('Username for the Virtual Machine.')
param adminUsername string = 'ubuntu'

var authenticationType = 'sshPublicKey'

@description('SSH Key value for the Virtual Machine.')
@secure()
param adminPasswordOrKey string
Expand Down Expand Up @@ -826,6 +828,8 @@ resource publicIP 'Microsoft.Network/publicIPAddresses@2021-05-01' = {
}

resource vm 'Microsoft.Compute/virtualMachines@2021-11-01' = {
// checkov:skip=CKV_AZURE_97:'Microsoft.Compute/EncryptionAtHost' feature is not enabled for this subscription.
// checkov:skip=CKV_AZURE_151:Now a Windows VM and EncryptionAtHost feature not enabled for this subscription.
name: vmName
location: location
properties: {
Expand Down Expand Up @@ -859,6 +863,7 @@ resource vm 'Microsoft.Compute/virtualMachines@2021-11-01' = {
adminUsername: adminUsername
adminPassword: adminPasswordOrKey
linuxConfiguration: linuxConfiguration
allowExtensionOperations: false
}
}
}
Expand Down
22 changes: 11 additions & 11 deletions .github/workflows/bench.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
outputs:
needs-bench: ${{ steps.version-check.outputs.needs_bench }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0

Expand All @@ -34,7 +34,7 @@ jobs:
needs: check-if-needed
if: needs.check-if-needed.outputs.needs-bench == 1
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Inspect benchmark CI config
run: |
Expand All @@ -57,11 +57,11 @@ jobs:
- name: Configure rustc version
run: |
source ci/env
RUSTC_VERSION=$(grep channel rust-toolchain.toml | tail -n1 | tr -d " " | cut -f2 -d'"')
echo "RUSTC_VERSION=$RUSTC_VERSION" >> "$GITHUB_ENV"
- name: Install Rust toolchain
uses: actions-rs/toolchain@v1
uses: gluwa/toolchain@dev
with:
toolchain: ${{ env.RUSTC_VERSION }}
target: wasm32-unknown-unknown
Expand All @@ -70,13 +70,13 @@ jobs:
- uses: Swatinem/rust-cache@v2

- name: Build benchmarks
uses: actions-rs/cargo@v1
uses: gluwa/cargo@dev
with:
command: build
args: --release --features runtime-benchmarks

- name: Upload benchmark binary
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: creditcoin-node
path: target/release/creditcoin-node
Expand All @@ -89,7 +89,7 @@ jobs:
resource_group: ${{ steps.get-env.outputs.resource_group }}

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Install azure-cli
run: |
Expand Down Expand Up @@ -155,7 +155,7 @@ jobs:
needs:
- deploy-github-runner
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 10
repository: ${{ github.event.pull_request.head.repo.full_name }}
Expand All @@ -167,7 +167,7 @@ jobs:
echo "HOME=/home/actions" >> "$GITHUB_ENV"
- name: Download benchmark binary
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: creditcoin-node
path: target/release
Expand Down Expand Up @@ -245,7 +245,7 @@ jobs:
if: ${{ always() && needs.deploy-github-runner.result != 'skipped' }}

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Evaluate env vars
id: get-env
Expand All @@ -269,7 +269,7 @@ jobs:
az group delete --yes -n "${{ steps.get-env.outputs.resource_group }}"
- name: Upload logs
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: always()
with:
name: "Azure resources"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/check-runtime-changes.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
check-version:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0

Expand All @@ -22,7 +22,7 @@ jobs:
danger-will-brick-the-blockchain:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0

Expand Down
Loading

0 comments on commit d8c4376

Please sign in to comment.