Skip to content

Commit

Permalink
Merge branch 'master' into dependabot/nuget/src/csharp/Intel/xunit.ru…
Browse files Browse the repository at this point in the history
…nner.visualstudio-3.0.1
  • Loading branch information
wtfsck authored Jan 21, 2025
2 parents ca5af21 + ca8274a commit 25f50a5
Show file tree
Hide file tree
Showing 6 changed files with 87 additions and 46 deletions.
4 changes: 1 addition & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -130,9 +130,7 @@ jobs:

- name: Install kcov
shell: bash
run: |
sudo apt-get update
sudo apt-get install kcov
run: ./build/ci-install-pkg-fallback-to-ubuntu-2204-LTS.sh kcov

- name: Build and test
shell: bash
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -331,7 +331,7 @@ jobs:
# shell: bash -le {0}
# setup-python is faster to install than setup-miniconda so we only
# use setup-miniconda if this is a macos image.
- uses: conda-incubator/[email protected].0
- uses: conda-incubator/[email protected].1
with:
python-version: '3.8'
- name: Install Python tools
Expand All @@ -346,7 +346,7 @@ jobs:
./build/build-python --no-set-rustflags --python python --quick-check
git clean -xdf
- uses: conda-incubator/[email protected].0
- uses: conda-incubator/[email protected].1
with:
python-version: '3.8'
- name: Build and test the wheel
Expand All @@ -355,7 +355,7 @@ jobs:
python --version 2>&1 | grep 'Python 3\.8'
bash build/ci-py-build-wheels.sh --build
- uses: conda-incubator/[email protected].0
- uses: conda-incubator/[email protected].1
with:
python-version: '3.9'
- name: Build and test the wheel
Expand All @@ -364,7 +364,7 @@ jobs:
python --version 2>&1 | grep 'Python 3\.9'
bash build/ci-py-build-wheels.sh
- uses: conda-incubator/[email protected].0
- uses: conda-incubator/[email protected].1
with:
python-version: '3.10'
- name: Build and test the wheel
Expand All @@ -373,7 +373,7 @@ jobs:
python --version 2>&1 | grep 'Python 3\.10'
bash build/ci-py-build-wheels.sh
- uses: conda-incubator/[email protected].0
- uses: conda-incubator/[email protected].1
with:
python-version: '3.11'
- name: Build and test the wheel
Expand Down
43 changes: 43 additions & 0 deletions build/ci-install-pkg-fallback-to-ubuntu-2204-LTS.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
#!/bin/bash
export DEBIAN_FRONTEND=noninteractive

# Check if the package name is provided
if [ -z "$1" ]; then
echo "Usage: $0 <package-name>"
exit 1
fi

PACKAGE=$1
sudo apt-get update

# Check if the package is available on the current system
if apt-cache show "$PACKAGE" > /dev/null 2>&1; then
echo "Package '$PACKAGE' is available in the current repository. Installing..."
sudo apt-get update
sudo apt-get install -y "$PACKAGE"
exit 0
else
echo "Package '$PACKAGE' is not available in the current repository."
echo "Adding the Ubuntu 22.04 (Jammy) repository..."
fi

# Add the Ubuntu 22.04 (Jammy) repository
echo "deb http://archive.ubuntu.com/ubuntu jammy main universe" | sudo tee /etc/apt/sources.list.d/ubuntu-jammy.list

# Update the package list
sudo apt-get update

# Try to install the package
if sudo apt-get install -y "$PACKAGE"; then
echo "Package '$PACKAGE' installed successfully from the Ubuntu 22.04 repository."
else
echo "Failed to install '$PACKAGE'. It might have unresolved dependencies."
fi

# Clean up: Remove the Ubuntu 22.04 repository
echo "Cleaning up the Ubuntu 22.04 repository..."
sudo rm /etc/apt/sources.list.d/ubuntu-jammy.list
sudo apt-get update

exit 0

2 changes: 1 addition & 1 deletion src/csharp/Intel/Generator/Misc/Python/PyiGen.cs
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ void WritePyi(List<PyClass> classes) {
}
}
else
writer.WriteLine($"class {pythonName}({baseClass}): ...");
writer.WriteLine($"class {pythonName}({baseClass}): ... # type: ignore");
}

var docGen = new PyiDocGen();
Expand Down
4 changes: 2 additions & 2 deletions src/csharp/Intel/Iced.UnitTests/Iced.UnitTests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="coverlet.msbuild" Version="6.0.2" />
<PackageReference Include="coverlet.msbuild" Version="6.0.4" />
<!-- NOTE: when updating this thing, make sure it hasn't gotten slower (it's happened twice now!) -->
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
<PackageReference Include="xunit" Version="2.9.2" />
<PackageReference Include="xunit.runner.console" Version="2.9.2" />
<PackageReference Include="xunit.runner.console" Version="2.9.3" />
<PackageReference Include="xunit.runner.visualstudio" Version="3.0.1" />
</ItemGroup>

Expand Down
70 changes: 35 additions & 35 deletions src/rust/iced-x86-py/src/iced_x86/_iced_x86_py.pyi
Original file line number Diff line number Diff line change
Expand Up @@ -9,53 +9,53 @@ from collections.abc import Iterator
from enum import IntEnum, IntFlag
from typing import Any, List, Optional, Union

class CC_a(IntEnum): ...
class CC_ae(IntEnum): ...
class CC_b(IntEnum): ...
class CC_be(IntEnum): ...
class CC_e(IntEnum): ...
class CC_g(IntEnum): ...
class CC_ge(IntEnum): ...
class CC_l(IntEnum): ...
class CC_le(IntEnum): ...
class CC_ne(IntEnum): ...
class CC_np(IntEnum): ...
class CC_p(IntEnum): ...
class Code(IntEnum): ...
class CodeSize(IntEnum): ...
class ConditionCode(IntEnum): ...
class CpuidFeature(IntEnum): ...
class DecoderError(IntEnum): ...
class CC_a(IntEnum): ... # type: ignore
class CC_ae(IntEnum): ... # type: ignore
class CC_b(IntEnum): ... # type: ignore
class CC_be(IntEnum): ... # type: ignore
class CC_e(IntEnum): ... # type: ignore
class CC_g(IntEnum): ... # type: ignore
class CC_ge(IntEnum): ... # type: ignore
class CC_l(IntEnum): ... # type: ignore
class CC_le(IntEnum): ... # type: ignore
class CC_ne(IntEnum): ... # type: ignore
class CC_np(IntEnum): ... # type: ignore
class CC_p(IntEnum): ... # type: ignore
class Code(IntEnum): ... # type: ignore
class CodeSize(IntEnum): ... # type: ignore
class ConditionCode(IntEnum): ... # type: ignore
class CpuidFeature(IntEnum): ... # type: ignore
class DecoderError(IntEnum): ... # type: ignore
class DecoderOptions(IntFlag):
NONE = 0x0000_0000
...
class EncodingKind(IntEnum): ...
class FlowControl(IntEnum): ...
class EncodingKind(IntEnum): ... # type: ignore
class FlowControl(IntEnum): ... # type: ignore
class FormatMnemonicOptions(IntFlag):
NONE = 0x0000_0000
...
class FormatterSyntax(IntEnum): ...
class MandatoryPrefix(IntEnum): ...
class MemorySize(IntEnum): ...
class MemorySizeOptions(IntEnum): ...
class Mnemonic(IntEnum): ...
class MvexConvFn(IntEnum): ...
class MvexEHBit(IntEnum): ...
class MvexRegMemConv(IntEnum): ...
class MvexTupleTypeLutKind(IntEnum): ...
class OpAccess(IntEnum): ...
class OpCodeOperandKind(IntEnum): ...
class OpCodeTableKind(IntEnum): ...
class OpKind(IntEnum): ...
class FormatterSyntax(IntEnum): ... # type: ignore
class MandatoryPrefix(IntEnum): ... # type: ignore
class MemorySize(IntEnum): ... # type: ignore
class MemorySizeOptions(IntEnum): ... # type: ignore
class Mnemonic(IntEnum): ... # type: ignore
class MvexConvFn(IntEnum): ... # type: ignore
class MvexEHBit(IntEnum): ... # type: ignore
class MvexRegMemConv(IntEnum): ... # type: ignore
class MvexTupleTypeLutKind(IntEnum): ... # type: ignore
class OpAccess(IntEnum): ... # type: ignore
class OpCodeOperandKind(IntEnum): ... # type: ignore
class OpCodeTableKind(IntEnum): ... # type: ignore
class OpKind(IntEnum): ... # type: ignore
class Register(IntEnum):
NONE = 0
...
class RepPrefixKind(IntEnum):
NONE = 0
...
class RflagsBits(IntFlag): ...
class RoundingControl(IntEnum): ...
class TupleType(IntEnum): ...
class RflagsBits(IntFlag): ... # type: ignore
class RoundingControl(IntEnum): ... # type: ignore
class TupleType(IntEnum): ... # type: ignore

class BlockEncoder:
"""
Expand Down

0 comments on commit 25f50a5

Please sign in to comment.