Skip to content
This repository has been archived by the owner on Dec 31, 2024. It is now read-only.

Commit

Permalink
Merge branch 'main' into t1-añadir-ejemplo-final
Browse files Browse the repository at this point in the history
  • Loading branch information
TeenBiscuits authored Mar 3, 2024
2 parents fa40749 + d545f1c commit 418e9d3
Show file tree
Hide file tree
Showing 194 changed files with 427 additions and 228 deletions.
4 changes: 4 additions & 0 deletions .github/FUNDING.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# SPDX-FileCopyrightText: 2024 Pablo Portas López <[email protected]>
#
# SPDX-License-Identifier: GPL-3.0-only

github: [TeenBiscuits]
ko_fi: pablopl
custom: [paypal.me/pabloportaslopez]
4 changes: 4 additions & 0 deletions .github/ISSUE_TEMPLATE/informe-de-error-bug.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# SPDX-FileCopyrightText: 2024 Pablo Portas López <[email protected]>
#
# SPDX-License-Identifier: GPL-3.0-only

name: "🐛 Informe de error/bug"
description: "Crea un informe para ayudarnos a mejorar"
title: "[BUG] <bug>"
Expand Down
4 changes: 4 additions & 0 deletions .github/ISSUE_TEMPLATE/solicitud-de-funcion.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# SPDX-FileCopyrightText: 2024 Pablo Portas López <[email protected]>
#
# SPDX-License-Identifier: GPL-3.0-only

name: "💡 Solicitud de función"
description: "Sugiere una idea para este proyecto."
title: '[SOLICITUD DE FUNCIÓN] <mejora>'
Expand Down
4 changes: 4 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# SPDX-FileCopyrightText: 2024 Pablo Portas López <[email protected]>
#
# SPDX-License-Identifier: GPL-3.0-only

version: 2
updates:
- package-ecosystem: "github-actions" # See documentation for possible values
Expand Down
2 changes: 1 addition & 1 deletion .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@

## ¿Qué he añadido?

- Lista de lo que he añadido
- Lista de lo que he añadido
8 changes: 7 additions & 1 deletion .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
# SPDX-FileCopyrightText: 2024 Pablo Portas López <[email protected]>
#
# SPDX-License-Identifier: GPL-3.0-only

name: Construir documentación

on:
push:
paths:
- 'docs/**'
branches: ["main"]

permissions:
Expand Down Expand Up @@ -55,7 +61,7 @@ jobs:
CONFIG_JSON_PRODUCT: PRO
CONFIG_JSON_VERSION: 2023-2024
# Requires the build-job results
needs: construir
needs: comprobar
runs-on: ubuntu-latest
container:
image: registry.jetbrains.team/p/writerside/builder/algolia-publisher:2.0.32-2
Expand Down
65 changes: 65 additions & 0 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
# SPDX-FileCopyrightText: 2024 Pablo Portas López <[email protected]>
#
# SPDX-License-Identifier: GPL-3.0-only

name: Comprobar documentación

on:
pull_request:
types:
- opened
paths:
- 'docs/**'
branches: ["main"]

permissions:
id-token: write
pages: write

env:
INSTANCE: docs/pro
ARTIFACT: webHelpPRO2-all.zip
# Writerside docker image version
DOCKER_VERSION: 233.14389

jobs:
construir:
runs-on: ubuntu-latest

steps:
- name: Checkout repositorio
uses: actions/checkout@v4

- name: Construir documentación de Writerside usando Docker
uses: JetBrains/writerside-github-action@v4
with:
instance: ${{ env.INSTANCE }}
artifact: ${{ env.ARTIFACT }}
docker-version: ${{ env.DOCKER_VERSION }}

- name: Subir artefacto
uses: actions/upload-artifact@v4
with:
name: docs
path: |
artifacts/${{ env.ARTIFACT }}
artifacts/report.json
retention-days: 1

comprobar:
# Requires build job results
needs: construir
runs-on: ubuntu-latest

steps:
- name: Descargar artefactos
uses: actions/download-artifact@v4
with:
name: docs
path: artifacts

- name: Comprobar documentación
uses: JetBrains/writerside-checker-action@v1
with:
instance: ${{ env.INSTANCE }}

2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# SPDX-FileCopyrightText: 2023 Pablo Portas López
# SPDX-FileCopyrightText: 2023 Pablo Portas López <[email protected]>
#
# SPDX-License-Identifier: CC0-1.0

Expand Down
16 changes: 0 additions & 16 deletions .idea/runConfigurations/Export_to_PDF.xml

This file was deleted.

18 changes: 18 additions & 0 deletions .idea/runConfigurations/Exportar_a_PDF.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

47 changes: 41 additions & 6 deletions .reuse/dep5
Original file line number Diff line number Diff line change
@@ -1,10 +1,45 @@
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: Pro2324
Upstream-Contact: Pablo Portas Lopez <[email protected]>
Upstream-Contact: Pablo Portas Lopez <[email protected]>
Source: https://github.com/TeenBiscuits/Pro2324

# Sample paragraph, commented out:
#
# Files: src/*
# Copyright: $YEAR $NAME <$CONTACT>
# License: ...
Files: logo/*
docs/images/Logo.*
docs/images/GitHubSponsors.png
docs/topics/*
Copyright: 2023 Pablo Portas Lopez <[email protected]>
License: CC-BY-NC-4.0

Files: .github/*
.all-contributorsrc
CONTRIBUTING.md
README.md
SECURITY.md
.idea/*
docs/code/*
docs/cfg/*
docs/keymap.xml
docs/pro.tree
docs/redirection-rules.xml
docs/writerside.cfg
Copyright: 2024 Pablo Portas Lopez <[email protected]>
License: GPL-3.0-only

Files: CODE_OF_CONDUCT.md
Copyright: 2021 Ethical Source
License: CC-BY-4.0

Files: docs/images/Tutoriales/Compilador/*
Copyright: Abel Cedron Santaeufemia
License: CC-BY-4.0

Files: docs/topics/Bloque-1.md
docs/topics/Bloque-2.md
docs/topics/Bloque-3.md
docs/topics/Bloque-4.md
Copyright: 2024 Daniel Feito Pin
License: CC-BY-NC-4.0

Files: docs/images/Apuntes/Bibliografia/C-Programming-Book.png
Copyright: K. N. King
License: CC0-1.0
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# SPDX-FileCopyrightText: 2023 Pablo Portas López
# SPDX-FileCopyrightText: 2023 Pablo Portas López <[email protected]>
#
# SPDX-License-Identifier: CC0-1.0

Expand Down
2 changes: 1 addition & 1 deletion CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ no.
## Aplicación

Instancias de comportamiento abusivo, acosador o inaceptable de otro modo podrán ser reportadas a los administradores de
la comunidad responsables del cumplimiento a través de [email protected]. Todas las quejas
la comunidad responsables del cumplimiento a través de [email protected]. Todas las quejas
serán evaluadas e investigadas de una manera puntual y justa.

Todos los administradores de la comunidad están obligados a respetar la privacidad y la seguridad de quienes reporten
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!--
SPDX-FileCopyrightText: 2024 Pablo Portas López
SPDX-FileCopyrightText: 2024 Pablo Portas López <[email protected]>
SPDX-License-Identifier: GPL-3.0-only
-->
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!--
SPDX-FileCopyrightText: 2024 Pablo Portas López
SPDX-FileCopyrightText: 2024 Pablo Portas López <[email protected]>
SPDX-License-Identifier: GPL-3.0-only
-->
Expand Down
4 changes: 2 additions & 2 deletions SECURITY.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!--
SPDX-FileCopyrightText: 2024 Pablo Portas López
SPDX-FileCopyrightText: 2024 Pablo Portas López <[email protected]>
SPDX-License-Identifier: GPL-3.0-only
-->
Expand All @@ -15,4 +15,4 @@ SPDX-License-Identifier: GPL-3.0-only

## Informar de una vulnerabilidad

En caso de encontrar una vulnerabilidad en el repositorio contactar por privado con [TeenBicuits](https://github.com/TeenBiscuits).
En caso de encontrar una vulnerabilidad en el repositorio contactar por privado con Pablo Portas López <[email protected]>.
2 changes: 1 addition & 1 deletion docs/cfg/buildprofiles.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<buildprofiles xsi:noNamespaceSchemaLocation="https://resources.jetbrains.com/writerside/1.0/build-profiles.xsd"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<!--
SPDX-FileCopyrightText: 2024 Pablo Portas López
SPDX-FileCopyrightText: 2024 Pablo Portas López <[email protected]>
SPDX-License-Identifier: GPL-3.0-only
-->
Expand Down
5 changes: 3 additions & 2 deletions docs/code/Boletin_1/Ejercicio_01.c
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
// SPDX-FileCopyrightText: 2023 Pablo Portas López
// SPDX-FileCopyrightText: 2023 Pablo Portas López <[email protected]>
//
// SPDX-License-Identifier: GPL-3.0-only
#include <stdio.h

#include <stdio.h>
#define MAX 20 // SE DECLARA EL TAMAÑO MÁXIMO Y SE ASIGNA POSTERIORMENTE EN nombre[MAX]
// NUNCA SOBREESCRIBIR EL LIMITE, YA QUE SERÍA UN MEMORY OVERFLOW Y ESO ES GRAVISIMO 0 :(
int main() {
Expand Down
3 changes: 2 additions & 1 deletion docs/code/Boletin_1/Ejercicio_02.c
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
// SPDX-FileCopyrightText: 2023 Pablo Portas López
// SPDX-FileCopyrightText: 2023 Pablo Portas López <[email protected]>
//
// SPDX-License-Identifier: GPL-3.0-only

#include <stdio.h>
#define MAX 30

Expand Down
3 changes: 2 additions & 1 deletion docs/code/Boletin_1/Ejercicio_03.c
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
// SPDX-FileCopyrightText: 2023 Pablo Portas López
// SPDX-FileCopyrightText: 2023 Pablo Portas López <[email protected]>
//
// SPDX-License-Identifier: GPL-3.0-only

#include <stdio.h>
#define superficie3(x, y) ((x*y)/2) // Defino la fórmula del area del triángulo

Expand Down
3 changes: 2 additions & 1 deletion docs/code/Boletin_1/Ejercicio_04.c
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
// SPDX-FileCopyrightText: 2023 Pablo Portas López
// SPDX-FileCopyrightText: 2023 Pablo Portas López <[email protected]>
//
// SPDX-License-Identifier: GPL-3.0-only

#include <stdio.h>
#define superficie2(x, y) (x*y) // DECLARO LA FÓRMULA DE LA SUPERFICIE DE UN RECTÁNGULO

Expand Down
3 changes: 2 additions & 1 deletion docs/code/Boletin_1/Ejercicio_05.c
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
// SPDX-FileCopyrightText: 2023 Pablo Portas López
// SPDX-FileCopyrightText: 2023 Pablo Portas López <[email protected]>
//
// SPDX-License-Identifier: GPL-3.0-only

#include <stdio.h>
#define superficie2(x, y) (x*y) // DECLARO LA FÓRMULA DE LA SUPERFICIE DE UN RECTÁNGULO

Expand Down
3 changes: 2 additions & 1 deletion docs/code/Boletin_1/Ejercicio_06.c
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
// SPDX-FileCopyrightText: 2023 Pablo Portas López
// SPDX-FileCopyrightText: 2023 Pablo Portas López <[email protected]>
//
// SPDX-License-Identifier: GPL-3.0-only

#include <stdio.h>
# define PI 3.14159265359
# define area(x) (4 * PI * x * x)
Expand Down
3 changes: 2 additions & 1 deletion docs/code/Boletin_1/Ejercicio_07.c
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
// SPDX-FileCopyrightText: 2023 Pablo Portas López
// SPDX-FileCopyrightText: 2023 Pablo Portas López <[email protected]>
//
// SPDX-License-Identifier: GPL-3.0-only

#include <stdio.h>
# define IVA 0.24

Expand Down
3 changes: 2 additions & 1 deletion docs/code/Boletin_1/Ejercicio_08.c
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
// SPDX-FileCopyrightText: 2023 Pablo Portas López
// SPDX-FileCopyrightText: 2023 Pablo Portas López <[email protected]>
//
// SPDX-License-Identifier: GPL-3.0-only

#include <stdio.h>

int main() {
Expand Down
3 changes: 2 additions & 1 deletion docs/code/Boletin_1/Ejercicio_09.c
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
// SPDX-FileCopyrightText: 2023 Pablo Portas López
// SPDX-FileCopyrightText: 2023 Pablo Portas López <[email protected]>
//
// SPDX-License-Identifier: GPL-3.0-only

#include <stdio.h>

int main() {
Expand Down
3 changes: 2 additions & 1 deletion docs/code/Boletin_1/Ejercicio_10.c
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
// SPDX-FileCopyrightText: 2023 Pablo Portas López
// SPDX-FileCopyrightText: 2023 Pablo Portas López <[email protected]>
//
// SPDX-License-Identifier: GPL-3.0-only

#include <stdio.h>

#define productoescalar(vx1,vy1,vz1,vx2,vy2,vz2) ((vx1*vx2)+(vy1*vy2)+(vz1*vz2))
Expand Down
3 changes: 2 additions & 1 deletion docs/code/Boletin_1/Ejercicio_11.c
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
// SPDX-FileCopyrightText: 2023 Pablo Portas López
// SPDX-FileCopyrightText: 2023 Pablo Portas López <[email protected]>
//
// SPDX-License-Identifier: GPL-3.0-only

#include <stdio.h>

int main() {
Expand Down
3 changes: 2 additions & 1 deletion docs/code/Boletin_1/Ejercicio_12.c
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
// SPDX-FileCopyrightText: 2023 Pablo Portas López
// SPDX-FileCopyrightText: 2023 Pablo Portas López <[email protected]>
//
// SPDX-License-Identifier: GPL-3.0-only

#include <stdio.h>

int main() {
Expand Down
3 changes: 2 additions & 1 deletion docs/code/Boletin_1/Ejercicio_13.c
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
// SPDX-FileCopyrightText: 2023 Pablo Portas López
// SPDX-FileCopyrightText: 2023 Pablo Portas López <[email protected]>
//
// SPDX-License-Identifier: GPL-3.0-only

#include <stdio.h>
#define PI 3.14159265359 // APROXIMACIÓN DE PI
#define perimetro(x) (2 * PI * x) // PERIMETRO DEL CÍRCULO
Expand Down
Loading

0 comments on commit 418e9d3

Please sign in to comment.