Skip to content

Commit

Permalink
Merge branch 'main' into get-functions
Browse files Browse the repository at this point in the history
  • Loading branch information
andrzejressel authored Sep 29, 2024
2 parents c73c7ba + b0ef60d commit 262cf11
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 16 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ubuntu-latest, windows-latest, macos-latest]
os: [ubuntu-24.04, windows-2022, macos-14]

env:
RUST_BACKTRACE: "full"
Expand Down Expand Up @@ -119,7 +119,7 @@ jobs:
pulumi_wasm_generator_lib/tests/**/target/cargo-timings/cargo-timing-*.html
deploy:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
needs: build
if: success() && github.ref == 'refs/heads/main'
env:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cleancache.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ permissions:

jobs:
build:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:
- run: gh cache delete --all -R $GITHUB_REPOSITORY
env:
Expand Down
22 changes: 11 additions & 11 deletions .github/workflows/deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ permissions:
jobs:

deploy_rust_registry:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04

steps:
- name: Cleanup unused stuff
Expand Down Expand Up @@ -56,7 +56,7 @@ jobs:


deploy_wasm_files:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04

steps:
- name: Cleanup unused stuff
Expand Down Expand Up @@ -143,7 +143,7 @@ jobs:
target/wasm32-wasip1/debug/*-debug.wasm
deploy_language_plugin:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04

steps:
- name: Write release version
Expand Down Expand Up @@ -184,13 +184,13 @@ jobs:
matrix:
include:
- rust-target: x86_64-unknown-linux-gnu
os: ubuntu-latest
os: ubuntu-24.04
- rust-target: x86_64-apple-darwin
os: macos-latest
os: macos-14
- rust-target: aarch64-apple-darwin
os: macos-latest
os: macos-14
- rust-target: x86_64-pc-windows-msvc
os: windows-latest
os: windows-2022

steps:
- name: Cleanup unused stuff
Expand All @@ -215,13 +215,13 @@ jobs:
- run: git config --system core.longpaths true
if: runner.os == 'Windows'
- name: Write release version (non-Windows)
if: matrix.os != 'windows-latest'
if: matrix.os != 'windows-2022'
run: |
VERSION=${GITHUB_REF_NAME#v}
echo "Version: $VERSION"
echo "VERSION=$VERSION" >> $GITHUB_ENV
- name: Write release version (Windows)
if: matrix.os == 'windows-latest'
if: matrix.os == 'windows-2022'
run: |
$VERSION = $env:GITHUB_REF_NAME -replace "^v"
echo "Version: $VERSION"
Expand Down Expand Up @@ -266,12 +266,12 @@ jobs:
cp ./target/${{ matrix.rust-target }}/debug/pulumi_wasm_runner.exe ./target/${{ matrix.rust-target }}/debug/pulumi_wasm_runner-${{ matrix.rust-target }}-debug
cp ./target/${{ matrix.rust-target }}/release/pulumi_wasm_runner.exe ./target/${{ matrix.rust-target }}/release/pulumi_wasm_runner-${{ matrix.rust-target }}
cp ./target/${{ matrix.rust-target }}/release/pulumi_wasm_runner.exe ./target/${{ matrix.rust-target }}/release/pulumi_wasm_runner-${{ matrix.rust-target }}-release
if: matrix.os == 'windows-latest'
if: matrix.os == 'windows-2022'
- run: |
cp ./target/${{ matrix.rust-target }}/debug/pulumi_wasm_runner ./target/${{ matrix.rust-target }}/debug/pulumi_wasm_runner-${{ matrix.rust-target }}-debug
cp ./target/${{ matrix.rust-target }}/release/pulumi_wasm_runner ./target/${{ matrix.rust-target }}/release/pulumi_wasm_runner-${{ matrix.rust-target }}
cp ./target/${{ matrix.rust-target }}/release/pulumi_wasm_runner ./target/${{ matrix.rust-target }}/release/pulumi_wasm_runner-${{ matrix.rust-target }}-release
if: matrix.os != 'windows-latest'
if: matrix.os != 'windows-2022'
- name: Release
uses: softprops/[email protected]
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
environment:
name: github-pages
url: ${{ steps.deployment.outputs.page_url }}
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:
- name: Checkout
uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/rust-clippy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ concurrency:
jobs:
rust-clippy-analyze:
name: Run rust-clippy analyzing
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
permissions:
contents: read
security-events: write
Expand Down

0 comments on commit 262cf11

Please sign in to comment.