Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

try fix apt #989

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

try fix apt #989

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions .github/workflows/Dockerfile.jammy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,11 @@ COPY tests/python/requirements.txt /tmp/
# php 7.4 on ubuntu 22, where default php version is 8.1

RUN apt update && \
apt install -y --no-install-recommends apt-utils ca-certificates gnupg wget software-properties-common pkg-config && \
wget -qO /etc/apt/trusted.gpg.d/vkpartner.asc https://artifactory-external.vkpartner.ru/artifactory/api/gpg/key/public && \
apt install -y --no-install-recommends apt-utils ca-certificates gnupg wget software-properties-common pkg-config neofetch

RUN neofetch

RUN wget -qO /etc/apt/trusted.gpg.d/vkpartner.asc https://artifactory-external.vkpartner.ru/artifactory/api/gpg/key/public && \
echo "deb https://artifactory-external.vkpartner.ru/artifactory/kphp jammy main" >> /etc/apt/sources.list && \
add-apt-repository ppa:ondrej/php -y && \
add-apt-repository ppa:deadsnakes/ppa && \
Expand Down
5 changes: 4 additions & 1 deletion compiler/code-gen/files/vars-cpp.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,10 @@ static void compile_vars_part(CodeGenerator &W, const std::vector<VarPtr> &vars,
VarsCpp::VarsCpp(std::vector<int> &&max_dep_levels, size_t parts_cnt)
: max_dep_levels_(std::move(max_dep_levels))
, parts_cnt_(parts_cnt) {
kphp_assert (1 <= parts_cnt_ && parts_cnt_ <= 1024);
kphp_assert(1 <= parts_cnt_);
kphp_error(parts_cnt_ <= G->settings().globals_split_count.get(),
fmt_format("Too many globals initialization .cpp files({}) for the specified globals_split_count({})", parts_cnt_,
G->settings().globals_split_count.get()));
}

void VarsCpp::compile(CodeGenerator &W) const {
Expand Down
2 changes: 1 addition & 1 deletion compiler/kphp2cpp.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ int main(int argc, char *argv[]) {
parser.add("Threads number for the transpilation", settings->threads_count,
't', "threads-count", "KPHP_THREADS_COUNT", std::to_string(get_default_threads_count()));
parser.add("Count of global variables per dedicated .cpp file. Lowering it could decrease compilation time", settings->globals_split_count,
"globals-split-count", "KPHP_GLOBALS_SPLIT_COUNT", "1024");
"globals-split-count", "KPHP_GLOBALS_SPLIT_COUNT", "1536");
parser.add("Builtin tl schema. Incompatible with lib mode", settings->tl_schema_file,
'T', "tl-schema", "KPHP_TL_SCHEMA");
parser.add("Generate storers and fetchers for internal tl functions", settings->gen_tl_internals,
Expand Down
Loading