Skip to content

Commit

Permalink
CI fixes and updates
Browse files Browse the repository at this point in the history
- Switch away from apt-get
- Use -f to fix libc issues
- Bump CI BYOND to 1606
  • Loading branch information
Cyberboss committed May 14, 2023
1 parent 25a74c3 commit 8452503
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 12 deletions.
16 changes: 8 additions & 8 deletions .github/workflows/ci-suite.yml
Original file line number Diff line number Diff line change
Expand Up @@ -103,14 +103,14 @@ jobs:
if: "!(cancelled() || failure()) && needs.start-ci-run-gate.result == 'success'"
env:
BYOND_MAJOR: 515
BYOND_MINOR: 1592
runs-on: ubuntu-latest
BYOND_MINOR: 1606
runs-on: ubuntu-20.04
steps:
- name: Install x86 libc Dependencies
run: |
sudo dpkg --add-architecture i386
sudo apt-get update
sudo apt-get install -y -o APT::Immediate-Configure=0 libc6-i386 libstdc++6:i386
sudo apt update
sudo apt -f install -y -o APT::Immediate-Configure=0 libc6-i386 libstdc++6:i386
- name: Install BYOND
if: steps.cache-byond.outputs.cache-hit != 'true'
Expand Down Expand Up @@ -435,8 +435,8 @@ jobs:
- name: Install Native Dependencies
run: |
sudo dpkg --add-architecture i386
sudo apt-get update
sudo apt-get install -y -o APT::Immediate-Configure=0 libc6-i386 libstdc++6:i386 gdb
sudo apt update
sudo apt -f install -y -o APT::Immediate-Configure=0 libc6-i386 libstdc++6:i386 gdb
- name: Install Node 12.X
uses: actions/setup-node@v3
Expand Down Expand Up @@ -959,8 +959,8 @@ jobs:

- name: Parse TGS version
run: |
sudo apt-get update
sudo apt-get install -y xmlstarlet
sudo apt update
sudo apt install -y xmlstarlet
echo "TGS_VERSION=$(xmlstarlet sel -N X="http://schemas.microsoft.com/developer/msbuild/2003" --template --value-of /X:Project/X:PropertyGroup/X:TgsCoreVersion build/Version.props)" >> $GITHUB_ENV
- name: Docker Build and Push
Expand Down
8 changes: 4 additions & 4 deletions build/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ ENV PATH $NVM_DIR/versions/node/v$NODE_VERSION/bin:$PATH
RUN . $NVM_DIR/nvm.sh \
&& nvm install $NODE_VERSION \
&& nvm use $NODE_VERSION \
&& apt-get update \
&& apt-get install -y \
&& apt update \
&& apt install -y \
dos2unix \
&& rm -rf /var/lib/apt/lists/* \
&& npm install -g npm
Expand Down Expand Up @@ -61,8 +61,8 @@ RUN dotnet publish -c Release -o /app/lib/Default && mv /app/lib/Default/appsett
FROM mcr.microsoft.com/dotnet/aspnet:6.0-bullseye-slim

#needed for byond
RUN apt-get update \
&& apt-get install -y \
RUN apt update \
&& apt install -y \
gcc-multilib \
gdb \
curl \
Expand Down

0 comments on commit 8452503

Please sign in to comment.