Skip to content

Commit ca07871

Browse files
committed
Merge branch 'main' into caleb/fix/stringdata
2 parents 4e07043 + c2de958 commit ca07871

File tree

3 files changed

+8
-14
lines changed

3 files changed

+8
-14
lines changed

.github/workflows/test-and-publish.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,9 @@ jobs:
5959
strategy:
6060
fail-fast: false
6161
matrix:
62-
# Use Ubuntu 20.04 / Ubuntu 24.04 / macOS 13 x86_64 / macOS 14 arm64 + Python 3.10 to build SpiderMonkey
63-
os: [ 'ubuntu-20.04', 'ubuntu-24.04', 'macos-13', 'macos-14', 'pi' ] # macOS 14 runner exclusively runs on M1 hardwares
64-
# see https://github.blog/changelog/2024-01-30-github-actions-macos-14-sonoma-is-now-available
62+
# Use Ubuntu 20.04 / macOS 13 x86_64 / macOS 14 arm64 + Python 3.10 to build SpiderMonkey
63+
os: [ 'ubuntu-20.04', 'macos-13', 'macos-14', 'pi' ] # macOS 14 runner exclusively runs on M1 hardwares
64+
# see https://github.blog/changelog/2024-01-30-github-actions-macos-14-sonoma-is-now-available
6565
python_version: [ '3.10' ]
6666
runs-on: ${{ matrix.os }}
6767
steps:
@@ -127,7 +127,7 @@ jobs:
127127
strategy:
128128
fail-fast: false
129129
matrix:
130-
os: [ 'ubuntu-20.04', 'ubuntu-24.04', 'macos-12', 'macos-14', 'windows-2022', 'pi' ]
130+
os: [ 'ubuntu-20.04', 'macos-12', 'macos-14', 'windows-2022', 'pi' ]
131131
python_version: [ '3.8', '3.9', '3.10', '3.11', '3.12' ]
132132
exclude:
133133
# actions/setup-python: The version '3.8'/'3.9' with architecture 'arm64' was not found for macOS.

python/pythonmonkey/builtin_modules/base64.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@
88

99

1010
def atob(b64):
11-
return str(base64.standard_b64decode(b64), 'latin1')
11+
padding = '=' * (4 - (len(b64) & 3))
12+
return str(base64.standard_b64decode(b64 + padding), 'latin1')
1213

1314

1415
def btoa(data):

setup.sh

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,11 @@ if [[ "$OSTYPE" == "linux-gnu"* ]]; then # Linux
1313
SUDO='sudo'
1414
fi
1515
echo "Installing apt packages"
16-
$SUDO apt-get install --yes cmake graphviz llvm clang pkg-config m4 unzip \
16+
$SUDO apt-get install --yes cmake llvm clang pkg-config m4 unzip \
1717
wget curl python3-dev
18-
# Install Doxygen
19-
# the newest version in Ubuntu 20.04 repository is 1.8.17, but we need Doxygen 1.9 series
20-
echo "Installing doxygen"
21-
wget -c -q https://www.doxygen.nl/files/doxygen-1.9.7.linux.bin.tar.gz
22-
tar xf doxygen-1.9.7.linux.bin.tar.gz
23-
cd doxygen-1.9.7 && $SUDO make install && cd -
24-
rm -rf doxygen-1.9.7 doxygen-1.9.7.linux.bin.tar.gz
2518
elif [[ "$OSTYPE" == "darwin"* ]]; then # macOS
2619
brew update || true # allow failure
27-
brew install cmake doxygen pkg-config wget unzip coreutils # `coreutils` installs the `realpath` command
20+
brew install cmake pkg-config wget unzip coreutils # `coreutils` installs the `realpath` command
2821
elif [[ "$OSTYPE" == "msys"* ]]; then # Windows
2922
echo "Dependencies are not going to be installed automatically on Windows."
3023
else

0 commit comments

Comments
 (0)