Skip to content

Commit a5eff9f

Browse files
mydeaasottile-sentrysl0thentr0py
authored
Revert changes since 1.2.3 (#475)
* Revert "ref: add python3-packaging explicitly (#474)" This reverts commit ddd80e5. * Revert "fix(hex): Add erlang-dev for missing parsetools (#473)" This reverts commit edf83d2. * Revert "feat(build): Bump Dockerfile base image to node:20-bookworm (#472)" This reverts commit 0941c46. --------- Co-authored-by: anthony sottile <[email protected]> Co-authored-by: Neel Shah <[email protected]>
1 parent ddd80e5 commit a5eff9f

File tree

4 files changed

+7
-11
lines changed

4 files changed

+7
-11
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
runs-on: ubuntu-latest
1212
strategy:
1313
matrix:
14-
node: ['14', '16', '20']
14+
node: ['14', '16']
1515
name: Node ${{ matrix.node }}
1616
steps:
1717
- uses: actions/checkout@v3

Dockerfile

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM node:20-bookworm
1+
FROM node:14-bullseye
22

33
ENV DEBIAN_FRONTEND=noninteractive \
44
DOTNET_CLI_TELEMETRY_OPTOUT=1 \
@@ -16,21 +16,18 @@ RUN apt-get -qq update \
1616
dirmngr \
1717
gnupg \
1818
git \
19-
python3-packaging \
2019
ruby-full \
2120
twine \
2221
jq \
2322
unzip \
24-
openjdk-17-jdk \
23+
openjdk-11-jdk \
2524
maven \
2625
elixir \
27-
erlang-dev \
28-
# TODO bump packages.microsoft.com to debian/12 when microsoft updates the package
29-
&& curl -fsSL https://packages.microsoft.com/config/debian/11/packages-microsoft-prod.deb -o /tmp/packages-microsoft-prod.deb \
26+
&& curl -fsSL https://packages.microsoft.com/config/debian/10/packages-microsoft-prod.deb -o /tmp/packages-microsoft-prod.deb \
3027
&& dpkg -i /tmp/packages-microsoft-prod.deb \
3128
&& rm /tmp/packages-microsoft-prod.deb \
3229
&& curl -fsSL https://download.docker.com/linux/debian/gpg | apt-key add - \
33-
&& echo 'deb [arch=amd64] https://download.docker.com/linux/debian bookworm stable' >> /etc/apt/sources.list \
30+
&& echo 'deb [arch=amd64] https://download.docker.com/linux/debian buster stable' >> /etc/apt/sources.list \
3431
&& apt-get update -qq \
3532
&& apt-get install -y --no-install-recommends \
3633
dotnet-sdk-7.0 \

cloudbuild.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
steps:
2-
- name: 'gcr.io/kaniko-project/executor:v1.12.1'
2+
- name: 'gcr.io/kaniko-project/executor:v1.5.1'
33
args:
44
- '--cache=true'
55
- '--use-new-run'
@@ -9,7 +9,7 @@ steps:
99
- '-f'
1010
- 'builder.dockerfile'
1111
- name: 'us.gcr.io/$PROJECT_ID/craft:builder-$COMMIT_SHA'
12-
- name: 'gcr.io/kaniko-project/executor:v1.12.1'
12+
- name: 'gcr.io/kaniko-project/executor:v1.5.1'
1313
args:
1414
- '--cache=true'
1515
- '--use-new-run'

src/targets/hex.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,6 @@ export class HexTarget extends BaseTarget {
8282
const spawnOptions = { cwd: directory };
8383
const spawnProcessOptions = { showStdout: true };
8484
await spawnProcess(MIX_BIN, ['local.hex', '--force'], spawnOptions, spawnProcessOptions);
85-
await spawnProcess(MIX_BIN, ['local.rebar', '--force'], spawnOptions, spawnProcessOptions);
8685
await spawnProcess(MIX_BIN, ['deps.get'], spawnOptions, spawnProcessOptions);
8786
await spawnProcess(MIX_BIN, ['hex.publish', '--yes'], spawnOptions, spawnProcessOptions);
8887
},

0 commit comments

Comments
 (0)