Skip to content

Commit 2132842

Browse files
goosewobblergoosewobbler
committed
chore: fix heredoc issues
1 parent 09743b4 commit 2132842

File tree

4 files changed

+20
-36
lines changed

4 files changed

+20
-36
lines changed

‎.github/workflows/_ci-build-tauri-apps.reusable.yml‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -67,12 +67,10 @@ jobs:
6767
run: |
6868
echo "Fixing ARM64 package sources for Ubuntu..."
6969
# Add proper arm64 sources for jammy
70-
sudo tee /etc/apt/sources.list.d/arm64-jammy.list >/dev/null << 'EOF'
71-
deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ jammy main restricted universe multiverse
72-
deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ jammy-updates main restricted universe multiverse
73-
deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ jammy-backports main restricted universe multiverse
74-
deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ jammy-security main restricted universe multiverse
75-
EOF
70+
echo "deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ jammy main restricted universe multiverse" | sudo tee /etc/apt/sources.list.d/arm64-jammy.list > /dev/null
71+
echo "deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ jammy-updates main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list.d/arm64-jammy.list > /dev/null
72+
echo "deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ jammy-backports main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list.d/arm64-jammy.list > /dev/null
73+
echo "deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ jammy-security main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list.d/arm64-jammy.list > /dev/null
7674
7775
# Ensure default sources only use amd64
7876
sudo sed -i -e 's/^deb http/deb [arch=amd64] http/' /etc/apt/sources.list
@@ -87,9 +85,7 @@ jobs:
8785
echo "Installing Tauri dependencies for Linux..."
8886
# Only add archive.ubuntu.com for amd64, arm64 sources are handled above
8987
if [ "$(uname -m)" != "aarch64" ]; then
90-
sudo tee -a /etc/apt/sources.list > /dev/null <<EOT
91-
deb http://archive.ubuntu.com/ubuntu jammy main universe
92-
EOT
88+
echo "deb http://archive.ubuntu.com/ubuntu jammy main universe" | sudo tee -a /etc/apt/sources.list > /dev/null
9389
fi
9490
sudo apt-get update
9591
# Install build dependencies only (no runtime libraries needed for compilation)

‎.github/workflows/_ci-build-tauri-e2e-app.reusable.yml‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -71,12 +71,10 @@ jobs:
7171
run: |
7272
echo "Fixing ARM64 package sources for Ubuntu..."
7373
# Add proper arm64 sources for jammy
74-
sudo tee /etc/apt/sources.list.d/arm64-jammy.list >/dev/null << 'EOF'
75-
deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ jammy main restricted universe multiverse
76-
deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ jammy-updates main restricted universe multiverse
77-
deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ jammy-backports main restricted universe multiverse
78-
deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ jammy-security main restricted universe multiverse
79-
EOF
74+
echo "deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ jammy main restricted universe multiverse" | sudo tee /etc/apt/sources.list.d/arm64-jammy.list > /dev/null
75+
echo "deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ jammy-updates main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list.d/arm64-jammy.list > /dev/null
76+
echo "deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ jammy-backports main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list.d/arm64-jammy.list > /dev/null
77+
echo "deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ jammy-security main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list.d/arm64-jammy.list > /dev/null
8078
8179
# Ensure default sources only use amd64
8280
sudo sed -i -e 's/^deb http/deb [arch=amd64] http/' /etc/apt/sources.list
@@ -91,9 +89,7 @@ jobs:
9189
echo "Installing Tauri dependencies for Linux..."
9290
# Only add archive.ubuntu.com for amd64, arm64 sources are handled above
9391
if [ "$(uname -m)" != "aarch64" ]; then
94-
sudo tee -a /etc/apt/sources.list > /dev/null <<EOT
95-
deb http://archive.ubuntu.com/ubuntu jammy main universe
96-
EOT
92+
echo "deb http://archive.ubuntu.com/ubuntu jammy main universe" | sudo tee -a /etc/apt/sources.list > /dev/null
9793
fi
9894
sudo apt-get update
9995
sudo apt-get install -y \

‎.github/workflows/_ci-build-tauri-package-app.reusable.yml‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -59,12 +59,10 @@ jobs:
5959
run: |
6060
echo "Fixing ARM64 package sources for Ubuntu..."
6161
# Add proper arm64 sources for jammy
62-
sudo tee /etc/apt/sources.list.d/arm64-jammy.list >/dev/null << 'EOF'
63-
deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ jammy main restricted universe multiverse
64-
deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ jammy-updates main restricted universe multiverse
65-
deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ jammy-backports main restricted universe multiverse
66-
deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ jammy-security main restricted universe multiverse
67-
EOF
62+
echo "deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ jammy main restricted universe multiverse" | sudo tee /etc/apt/sources.list.d/arm64-jammy.list > /dev/null
63+
echo "deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ jammy-updates main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list.d/arm64-jammy.list > /dev/null
64+
echo "deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ jammy-backports main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list.d/arm64-jammy.list > /dev/null
65+
echo "deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ jammy-security main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list.d/arm64-jammy.list > /dev/null
6866
6967
# Ensure default sources only use amd64
7068
sudo sed -i -e 's/^deb http/deb [arch=amd64] http/' /etc/apt/sources.list
@@ -79,9 +77,7 @@ jobs:
7977
echo "Installing Tauri dependencies for Linux..."
8078
# Only add archive.ubuntu.com for amd64, arm64 sources are handled above
8179
if [ "$(uname -m)" != "aarch64" ]; then
82-
sudo tee -a /etc/apt/sources.list > /dev/null <<EOT
83-
deb http://archive.ubuntu.com/ubuntu jammy main universe
84-
EOT
80+
echo "deb http://archive.ubuntu.com/ubuntu jammy main universe" | sudo tee -a /etc/apt/sources.list > /dev/null
8581
fi
8682
sudo apt-get update
8783
sudo apt-get install -y \

‎.github/workflows/_ci-e2e-tauri.reusable.yml‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -83,12 +83,10 @@ jobs:
8383
run: |
8484
echo "Fixing ARM64 package sources for Ubuntu..."
8585
# Add proper arm64 sources for jammy
86-
sudo tee /etc/apt/sources.list.d/arm64-jammy.list >/dev/null << 'EOF'
87-
deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ jammy main restricted universe multiverse
88-
deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ jammy-updates main restricted universe multiverse
89-
deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ jammy-backports main restricted universe multiverse
90-
deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ jammy-security main restricted universe multiverse
91-
EOF
86+
echo "deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ jammy main restricted universe multiverse" | sudo tee /etc/apt/sources.list.d/arm64-jammy.list > /dev/null
87+
echo "deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ jammy-updates main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list.d/arm64-jammy.list > /dev/null
88+
echo "deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ jammy-backports main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list.d/arm64-jammy.list > /dev/null
89+
echo "deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ jammy-security main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list.d/arm64-jammy.list > /dev/null
9290
9391
# Ensure default sources only use amd64
9492
sudo sed -i -e 's/^deb http/deb [arch=amd64] http/' /etc/apt/sources.list
@@ -103,9 +101,7 @@ jobs:
103101
echo "Installing Tauri runtime dependencies for Linux..."
104102
# Only add archive.ubuntu.com for amd64, arm64 sources are handled above
105103
if [ "$(uname -m)" != "aarch64" ]; then
106-
sudo tee -a /etc/apt/sources.list > /dev/null <<EOT
107-
deb http://archive.ubuntu.com/ubuntu jammy main universe
108-
EOT
104+
echo "deb http://archive.ubuntu.com/ubuntu jammy main universe" | sudo tee -a /etc/apt/sources.list > /dev/null
109105
fi
110106
sudo apt-get update
111107
sudo apt-get --fix-broken install -y || true

0 commit comments

Comments
 (0)