Skip to content

Commit 6d609c8

Browse files
committed
Revert "Debug"
This reverts commit 5c23422.
1 parent 159b662 commit 6d609c8

File tree

3 files changed

+57
-57
lines changed

3 files changed

+57
-57
lines changed

.github/workflows/ci.yml

Lines changed: 55 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -25,16 +25,16 @@ jobs:
2525
include:
2626
- otp_version: "27.1"
2727
deterministic: true
28-
# - otp_version: "27.1"
29-
# otp_latest: true
30-
# - otp_version: "27.0"
31-
# - otp_version: "26.0"
32-
# - otp_version: "25.3"
33-
# - otp_version: "25.0"
34-
# - otp_version: master
35-
# development: true
36-
# - otp_version: maint
37-
# development: true
28+
- otp_version: "27.1"
29+
otp_latest: true
30+
- otp_version: "27.0"
31+
- otp_version: "26.0"
32+
- otp_version: "25.3"
33+
- otp_version: "25.0"
34+
- otp_version: master
35+
development: true
36+
- otp_version: maint
37+
development: true
3838
runs-on: ubuntu-24.04
3939
steps:
4040
- uses: actions/checkout@v4
@@ -77,49 +77,49 @@ jobs:
7777
cd lib/elixir && ../../bin/elixirc -o ebin lib/system.ex && cd -
7878
taskset 1 make check_reproducible
7979
80-
# test_windows:
81-
# name: Windows Server 2019, Erlang/OTP ${{ matrix.otp_version }}
82-
# strategy:
83-
# matrix:
84-
# otp_version: ["25.3", "26.2", "27.1"]
85-
# runs-on: windows-2022
86-
# steps:
87-
# - name: Configure Git
88-
# run: git config --global core.autocrlf input
89-
# - uses: actions/checkout@v4
90-
# with:
91-
# fetch-depth: 50
92-
# - uses: erlef/setup-beam@v1
93-
# with:
94-
# otp-version: ${{ matrix.otp_version }}
95-
# - name: Compile Elixir
96-
# run: |
97-
# Remove-Item -Recurse -Force '.git'
98-
# make compile
99-
# - name: Build info
100-
# run: bin/elixir --version
101-
# - name: Check format
102-
# run: make test_formatted && echo "All Elixir source code files are properly formatted."
103-
# - name: Erlang test suite
104-
# run: make --keep-going test_erlang
105-
# - name: Elixir test suite
106-
# run: |
107-
# Remove-Item 'c:/Windows/System32/drivers/etc/hosts'
108-
# make --keep-going test_elixir
80+
test_windows:
81+
name: Windows Server 2019, Erlang/OTP ${{ matrix.otp_version }}
82+
strategy:
83+
matrix:
84+
otp_version: ["25.3", "26.2", "27.1"]
85+
runs-on: windows-2022
86+
steps:
87+
- name: Configure Git
88+
run: git config --global core.autocrlf input
89+
- uses: actions/checkout@v4
90+
with:
91+
fetch-depth: 50
92+
- uses: erlef/setup-beam@v1
93+
with:
94+
otp-version: ${{ matrix.otp_version }}
95+
- name: Compile Elixir
96+
run: |
97+
Remove-Item -Recurse -Force '.git'
98+
make compile
99+
- name: Build info
100+
run: bin/elixir --version
101+
- name: Check format
102+
run: make test_formatted && echo "All Elixir source code files are properly formatted."
103+
- name: Erlang test suite
104+
run: make --keep-going test_erlang
105+
- name: Elixir test suite
106+
run: |
107+
Remove-Item 'c:/Windows/System32/drivers/etc/hosts'
108+
make --keep-going test_elixir
109109
110-
# check_posix_compliant:
111-
# name: Check POSIX-compliant
112-
# runs-on: ubuntu-24.04
113-
# steps:
114-
# - uses: actions/checkout@v4
115-
# with:
116-
# fetch-depth: 50
117-
# - name: Install Shellcheck
118-
# run: |
119-
# sudo apt update
120-
# sudo apt install -y shellcheck
121-
# - name: Check POSIX-compliant
122-
# run: |
123-
# shellcheck -e SC2039,2086 bin/elixir && echo "bin/elixir is POSIX compliant"
124-
# shellcheck bin/elixirc && echo "bin/elixirc is POSIX compliant"
125-
# shellcheck bin/iex && echo "bin/iex is POSIX compliant"
110+
check_posix_compliant:
111+
name: Check POSIX-compliant
112+
runs-on: ubuntu-24.04
113+
steps:
114+
- uses: actions/checkout@v4
115+
with:
116+
fetch-depth: 50
117+
- name: Install Shellcheck
118+
run: |
119+
sudo apt update
120+
sudo apt install -y shellcheck
121+
- name: Check POSIX-compliant
122+
run: |
123+
shellcheck -e SC2039,2086 bin/elixir && echo "bin/elixir is POSIX compliant"
124+
shellcheck bin/elixirc && echo "bin/elixirc is POSIX compliant"
125+
shellcheck bin/iex && echo "bin/iex is POSIX compliant"

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ check_reproducible: compile
146146
$(Q) mv lib/iex/ebin/* lib/iex/tmp/ebin_reproducible/
147147
$(Q) mv lib/logger/ebin/* lib/logger/tmp/ebin_reproducible/
148148
$(Q) mv lib/mix/ebin/* lib/mix/tmp/ebin_reproducible/
149-
$(Q) rm -rfv lib/*/ebin
149+
$(Q) rm -rf lib/*/ebin
150150
SOURCE_DATE_EPOCH=$(call READ_SOURCE_DATE_EPOCH) "$(MAKE)" compile
151151
$(Q) echo "Diffing..."
152152
$(Q) bin/elixir lib/elixir/scripts/diff.exs lib/elixir/ebin/ lib/elixir/tmp/ebin_reproducible/

lib/elixir/lib/module/types/apply.ex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -539,7 +539,7 @@ defmodule Module.Types.Apply do
539539
defp builtin_modules do
540540
case :persistent_term.get(__MODULE__, nil) do
541541
nil ->
542-
{:ok, mods} = :application.get_key(:elixir, :modules) |> IO.inspect
542+
{:ok, mods} = :application.get_key(:elixir, :modules)
543543
mods = Map.from_keys(mods, [])
544544
:persistent_term.put(__MODULE__, mods)
545545
mods

0 commit comments

Comments
 (0)