Compare commits

..

54 commits

Author SHA1 Message Date
b3e7810b5e Update .forgejo/workflows/release.yml 2025-06-26 17:10:00 +01:00
forgejo-actions
c4ac52c535 Start next development cycle 1.0.8-SNAPSHOT 2025-06-26 15:34:19 +00:00
6cfcec5168 Adicionar texto sobre o banner público e privado.
All checks were successful
Release / release (push) Successful in 14m47s
Fixes #18
2025-06-26 16:17:50 +01:00
cd7aa81a8a Update .forgejo/workflows/release.yml 2025-06-26 16:15:21 +01:00
ed76ddb28d Update .forgejo/workflows/release.yml 2025-06-26 13:23:38 +01:00
forgejo-actions
26f007fee5 Start next development cycle 1.0.7-SNAPSHOT 2025-06-26 12:12:42 +00:00
400b4d70da Reativar os STEPS para buid de Back-End
All checks were successful
Release / release (push) Successful in 20m30s
2025-06-26 12:51:56 +01:00
7bdf8f1f61 Update .forgejo/workflows/release.yml
All checks were successful
Release / release (push) Successful in 3m47s
2025-06-26 12:42:33 +01:00
c9724c0864 Update .forgejo/workflows/release.yml
Some checks failed
Release / release (push) Failing after 3m34s
2025-06-26 12:26:22 +01:00
b44f3c6526 Update .forgejo/workflows/release.yml
Some checks failed
Release / release (push) Failing after 3m47s
2025-06-26 12:15:59 +01:00
fb84ee7a0b Update .forgejo/workflows/release.yml
Some checks failed
Release / release (push) Failing after 3m36s
2025-06-26 12:07:00 +01:00
71dd64f71b Update .forgejo/workflows/release.yml
Some checks failed
Release / release (push) Failing after 3m39s
2025-06-26 11:58:19 +01:00
da934949c2 Update .forgejo/workflows/release.yml
Some checks failed
Release / release (push) Failing after 3m41s
2025-06-26 11:38:38 +01:00
ee1032a6b6 Update .forgejo/workflows/release.yml
Some checks failed
Release / release (push) Failing after 3m18s
2025-06-26 11:14:55 +01:00
a8cf628dc8 Atualizar imagens (tabela e gráficos) para resultados de 2024
Closes #17
2025-06-26 11:09:05 +01:00
86f5b35ef2 Update .forgejo/workflows/release.yml
Some checks failed
Release / release (push) Failing after 3m42s
2025-06-26 11:05:25 +01:00
16243f7485 Update .forgejo/workflows/release.yml
Some checks failed
Release / release (push) Failing after 3m28s
2025-06-26 10:55:04 +01:00
b350c20172 Update .forgejo/workflows/release.yml
Some checks failed
Release / release (push) Failing after 2m59s
2025-06-26 09:20:22 +01:00
3ec8a32b60 Update .forgejo/workflows/release.yml
Some checks failed
Release / release (push) Failing after 4m9s
2025-06-26 08:49:45 +01:00
7bc8a41278 Update .forgejo/workflows/release.yml
Some checks failed
Release / release (push) Failing after 3m18s
2025-06-25 17:53:43 +01:00
53808ae657 Update .forgejo/workflows/release.yml
Some checks failed
Release / release (push) Failing after 3m17s
2025-06-25 17:43:46 +01:00
08acf6949c Update .forgejo/workflows/release.yml
Some checks failed
Release / release (push) Failing after 3m54s
2025-06-25 17:30:19 +01:00
02a5fac535 Update .forgejo/workflows/release.yml
Some checks failed
Release / release (push) Failing after 2m57s
2025-06-25 17:20:07 +01:00
0c12aaeafe Update .forgejo/workflows/release.yml
Some checks failed
Release / release (push) Failing after 3m28s
2025-06-25 17:12:02 +01:00
6060a7d85a Update .forgejo/workflows/release.yml
Some checks failed
Release / release (push) Failing after 3m31s
2025-06-25 16:58:55 +01:00
508662ee86 Update .forgejo/workflows/release.yml
Some checks failed
Release / release (push) Failing after 3m43s
2025-06-25 16:40:25 +01:00
fb8856f35e Update .forgejo/workflows/release.yml
Some checks failed
Release / release (push) Failing after 3m15s
2025-06-25 16:34:36 +01:00
511e09fb86 Update .forgejo/workflows/release.yml
Some checks failed
Release / release (push) Failing after 3m28s
2025-06-25 16:21:56 +01:00
0cd637fb20 Update .forgejo/workflows/release.yml
Some checks failed
Release / release (push) Failing after 3m15s
2025-06-25 16:11:35 +01:00
a27d2b6991 Update .forgejo/workflows/release.yml
All checks were successful
Release / release (push) Successful in 3m30s
2025-06-25 15:53:04 +01:00
73c203502c Update .forgejo/workflows/release.yml 2025-06-25 15:48:33 +01:00
942ea9adc6 Update .forgejo/workflows/release.yml
All checks were successful
Release / release (push) Successful in 3m39s
2025-06-25 13:33:40 +01:00
ef24c21df4 Update .forgejo/workflows/release.yml
Some checks failed
Release / release (push) Failing after 4m0s
2025-06-25 13:25:43 +01:00
cb96a7c37a Update .forgejo/workflows/release.yml
Some checks failed
Release / release (push) Failing after 3m8s
2025-06-25 13:16:34 +01:00
3c55e5531b Update .forgejo/workflows/release.yml
Some checks failed
Release / release (push) Failing after 3m35s
2025-06-25 12:59:26 +01:00
28dfa150b5 Update .forgejo/workflows/release.yml
Some checks failed
Release / release (push) Failing after 4m16s
2025-06-25 12:50:46 +01:00
bff8b4db76 Update .forgejo/workflows/release.yml
Some checks failed
Release / release (push) Failing after 3m56s
2025-06-25 12:44:04 +01:00
a6fc675dca Update .forgejo/workflows/release.yml
Some checks failed
Release / release (push) Failing after 2m57s
2025-06-25 12:27:15 +01:00
84a56499a9 Update .forgejo/workflows/release.yml 2025-06-25 12:25:52 +01:00
18b3a32ac0 Update .forgejo/workflows/release.yml 2025-06-25 12:24:01 +01:00
f6507cf82e Update .forgejo/workflows/release.yml
Some checks failed
Release / release (push) Failing after 17m26s
2025-06-25 12:04:32 +01:00
d1801774c0 Update .forgejo/workflows/release.yml 2025-06-25 11:58:51 +01:00
f6267abdd5 Update .forgejo/workflows/release.yml 2025-06-25 11:58:03 +01:00
8f3ddcae10 Update .forgejo/workflows/release.yml 2025-06-25 11:54:32 +01:00
579ab99e08 Update .forgejo/workflows/release.yml
Some checks failed
Release / release (push) Failing after 16m25s
2025-06-25 11:31:05 +01:00
a223d77e93 Update .forgejo/workflows/release.yml 2025-06-25 11:30:12 +01:00
74341f28e7 Update .forgejo/workflows/ci-settings.xml
All checks were successful
Release / release (push) Successful in 14m27s
2025-06-25 11:07:40 +01:00
f265687fcc Update .forgejo/workflows/release.yml 2025-06-25 11:07:18 +01:00
563be82cb3 Update .forgejo/workflows/release.yml
Some checks failed
Release / release (push) Has been cancelled
2025-06-25 10:03:44 +01:00
38b91df37c Update .forgejo/workflows/ci-settings.xml 2025-06-25 09:55:02 +01:00
f1b137c8a2 Update .forgejo/workflows/release.yml
All checks were successful
Release / release (push) Successful in 19m5s
2025-06-25 08:25:28 +01:00
e113dd6d9e Update .forgejo/workflows/release.yml 2025-06-25 08:23:58 +01:00
2fbac46c2e Update .forgejo/workflows/release.yml 2025-06-25 08:17:15 +01:00
forgejo-actions
39892ceb24 Start next development cycle 1.0.6-SNAPSHOT 2025-06-24 23:20:05 +00:00
10 changed files with 162 additions and 26 deletions

View file

@ -2,6 +2,13 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0
https://maven.apache.org/xsd/settings-1.0.0.xsd">
<!--
Configured in docker-container with mappend volume 'maven-cache:/maven-repo',
and then, in release.yml STEP 'Build backend (Spring Boot)' with 'volumes:- docker-forgejo_maven-cache:/root/.m2'
<localRepository>/root/.m2/repository</localRepository>
-->
<mirrors>
<mirror>
<id>nexus</id>

View file

@ -14,7 +14,7 @@ jobs:
- name: Install system dependencies
run: |
apt-get update
apt-get install -y nodejs npm openjdk-17-jdk maven git
apt-get install -y nodejs npm openjdk-17-jdk maven git jq
export JAVA_HOME=$(dirname $(dirname $(readlink -f $(which javac))))
echo "JAVA_HOME=$JAVA_HOME" >> $GITHUB_ENV
@ -53,6 +53,106 @@ jobs:
git commit -am "Release ${{ steps.version.outputs.release_version }}"
git push
# Create the release notes (closed issues)
# Must be here, before the new tag, to get closed issued from the LAST TAG to NOW
- name: Generate release notes from closed issues
id: generate_notes
run: |
REPO_OWNER="root"
REPO_NAME="resilient"
TOKEN="${{ secrets.FORGEJO_TOKEN }}"
VERSION="${{ steps.version.outputs.release_version }}"
API_BASE="https://git.oguerreiro.com/api/v1"
# Step 1. Get the latest tag
echo "Step 1 : Fetching latest release tag..."
LATEST_TAG=$(curl -H "Authorization: token $TOKEN" \
"$API_BASE/repos/$REPO_OWNER/$REPO_NAME/tags" \
| jq -r '.[0].name')
if [[ -z "$LATEST_TAG" || "$LATEST_TAG" == "null" ]]; then
# Doesn't have tag. Its the first release
echo "No previous tags found. Assuming first release."
CLOSED_ISSUES=""
else
# Tag found
echo "Latest tag is: $LATEST_TAG"
# Step 2: Get the tag ref object
echo "Step 2 : Fetch tag ref object from tag = $LATEST_TAG"
TAG_REF=$(curl -H "Authorization: token $TOKEN" \
"$API_BASE/repos/$REPO_OWNER/$REPO_NAME/git/refs/tags/$LATEST_TAG")
echo "... TAG_REF is: $TAG_REF"
# Extract the first .object.sha (if it's an array) or directly if it's an object
if echo "$TAG_REF" | jq -e 'type == "array"' >/dev/null; then
echo "... is an array"
TAG_OBJECT_SHA=$(echo "$TAG_REF" | jq -r '.[0].object.sha')
TAG_OBJECT_TYPE=$(echo "$TAG_REF" | jq -r '.[0].object.type')
else
echo "... is an object"
TAG_OBJECT_SHA=$(echo "$TAG_REF" | jq -r '.object.sha')
TAG_OBJECT_TYPE=$(echo "$TAG_REF" | jq -r '.object.type')
fi
echo "... TAG SHA is (1): $TAG_OBJECT_SHA"
echo "... TAG TYPE is (1): $TAG_OBJECT_TYPE"
# Resolve annotated tag to commit SHA
while [ "$TAG_OBJECT_TYPE" != "commit" ]; do
echo "..."
echo "... TAG OBJECT is not of type commit. Try : $API_BASE/repos/$REPO_OWNER/$REPO_NAME/git/$TAG_OBJECT_TYPE/$TAG_OBJECT_SHA"
TAG_OBJECT=$(curl -H "Authorization: token $TOKEN" \
"$API_BASE/repos/$REPO_OWNER/$REPO_NAME/git/tags/$TAG_OBJECT_SHA")
if echo "$TAG_OBJECT" | jq -e 'type == "array"' >/dev/null; then
echo "... ... is an array"
TAG_OBJECT_SHA=$(echo "$v" | jq -r '.[0].object.sha')
TAG_OBJECT_TYPE=$(echo "$TAG_OBJECT" | jq -r '.[0].object.type')
else
echo "... ... is an object"
TAG_OBJECT_SHA=$(echo "$TAG_OBJECT" | jq -r '.object.sha')
TAG_OBJECT_TYPE=$(echo "$TAG_OBJECT" | jq -r '.object.type')
fi
echo "... TAG_OBJECT_SHA is (2): $TAG_OBJECT_SHA"
echo "... TAG_OBJECT_TYPE is (2): $TAG_OBJECT_TYPE"
done
echo "... commit found with SHA $TAG_OBJECT_SHA"
COMMIT_SHA=$TAG_OBJECT_SHA
# Step 3: Get the commit date
echo "Step 3 : Get the commit date from commit = $COMMIT_SHA"
COMMIT_DATE=$(curl -H "Authorization: token $TOKEN" \
"$API_BASE/repos/$REPO_OWNER/$REPO_NAME/git/commits/$COMMIT_SHA" \
| jq -r '.commit.committer.date')
echo "... Fetching closed issues since $COMMIT_DATE..."
CLOSED_ISSUES_JSON=$(curl -H "Authorization: token $TOKEN" \
"$API_BASE/repos/$REPO_OWNER/$REPO_NAME/issues?state=closed&since=$COMMIT_DATE")
if [[ -z "$CLOSED_ISSUES_JSON" ]]; then
echo "Warning: No closed issues or invalid response."
CLOSED_ISSUES=""
else
CLOSED_ISSUES=$(echo "$CLOSED_ISSUES_JSON" | jq -r '.[] | "- [#\(.number)](\(.html_url)) \(.title)"')
fi
fi
# Build release notes markdown
{
echo "## Release v$VERSION"
echo
if [[ -n "$CLOSED_ISSUES" ]]; then
echo "### Closed Issues"
echo "$CLOSED_ISSUES"
else
echo "No issues closed since last release."
fi
} > release-notes.md
cat release-notes.md
- name: Tag release
run: |
git tag -a v${{ steps.version.outputs.release_version }} -m "Release ${{ steps.version.outputs.release_version }}"
@ -62,43 +162,36 @@ jobs:
# Install @Angular dependencies
- name: Install frontend dependencies
if: false # DISABLED for testing. To check if backend build is also doing frontend.
run: |
cd src/main/webapp
npm ci
# Setup node_modules cache, for better performance
- name: Cache node_modules
uses: actions/cache@v3
with:
path: |
**/node_modules
key: node-modules-${{ hashFiles('**/package-lock.json') }}
restore-keys: |
node-modules-
# Build the frontend
- name: Build frontend
if: false # DISABLED for testing. To check if backend build is also doing frontend.
run: |
cd src/main/webapp
npm run build
# Setup Maven cache, for better performance
- name: Cache Maven dependencies
uses: actions/cache@v3
with:
path: ~/.m2/repository
key: maven-${{ runner.os }}-${{ hashFiles('**/pom.xml') }}
restore-keys: |
maven-${{ runner.os }}-
# Build the backend (JAR). NOTE: the -Dmaven.download.parallel=false will force MAVEN to have a single connection for downloads, without this I can get "Connection reset"
- name: Build backend (Spring Boot)
run: |
mvn clean package -Pprod -DskipTests -Dmaven.download.parallel=false -s .forgejo/workflows/ci-settings.xml
echo "DEBUG Outputs ************************* "
echo "Container hostname: $(hostname)"
echo "Runner working dir: $PWD"
echo "Runner user: $(whoami)"
echo "Listing contents of ~/.m2/repository:"
ls -lhR ~/.m2/repository | head -n 100 || echo "No .m2/repository found"
echo "Disk usage:"
du -sh ~/.m2/repository || echo "No .m2 directory found"
echo " "
echo "BUILD Outputs ************************* "
mvn clean package -Pprod -DskipTests -Dmaven.download.parallel=false -Dmaven.repo.local=/root/.m2/repository -s .forgejo/workflows/ci-settings.xml
container:
image: maven:3.9-eclipse-temurin-17
volumes:
- /maven-repo:/root/.m2
- docker-forgejo_maven-cache:/root/.m2
# Log output
- name: List output files
@ -112,6 +205,38 @@ jobs:
name: app-backend
path: target/resilient*.jar
# Create the release
# NOTE: added system dependency install "jq"
- name: Create release and upload JAR
run: |
VERSION=${{ steps.version.outputs.release_version }}
API="https://git.oguerreiro.com/api/v1"
REPO="root/resilient"
# Create release
RESPONSE=$(curl -X POST "$API/repos/$REPO/releases" \
-H "Authorization: token ${{ secrets.FORGEJO_TOKEN }}" \
-H "Content-Type: application/json" \
-d "{
\"tag_name\": \"v$VERSION\",
\"target_commitish\": \"master\",
\"name\": \"Release v$VERSION\",
\"body\": $(jq -Rs < release-notes.md)
}")
RELEASE_ID=$(echo "$RESPONSE" | jq -r '.id')
echo "Created release ID: $RELEASE_ID"
# Upload artifact
# NOTE: For safety, the artifact to upload is expected to be the EXACT $VERSION of this branch. If not, something is wrong.
JAR_FILE=$(ls target/resilient-$VERSION.jar | head -n 1)
echo "Attaching file : $JAR_FILE"
curl -X POST "$API/repos/$REPO/releases/$RELEASE_ID/assets?name=resilient-$VERSION.jar" \
-H "Authorization: token ${{ secrets.FORGEJO_TOKEN }}" \
-H "Content-Type: application/java-archive" \
--data-binary @"$JAR_FILE"
# ##################################################################
# ## THIS IS A RELEASE - Change master version to next SNAPSHOT ##
# ## #4. Checkout master ##

View file

@ -5,7 +5,7 @@
<groupId>com.oguerreiro.resilient</groupId>
<artifactId>resilient</artifactId>
<version>1.0.5</version>
<version>1.0.8-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Resilient</name>
<description>Description for Resilient</description>

View file

@ -1,6 +1,10 @@
<!-- TOP BANNER -->
<section>
<div class="container-fluid mb-5 p-0">
<img id="home-header" src="content/images/home_banner.jpg" class="img-fluid" alt="Route Zero">
<div class="container-fluid mb-5 p-0 position-relative">
<img id="home-header" src="content/images/home_banner.jpg" alt="Route Zero" class="img-fluid w-100">
<span class="position-absolute bottom-0 start-0 text-white p-3 fs-4 title">
InNOVA NOVA Information System on Environment and Sustainability
</span>
</div>
</section>

Binary file not shown.

After

Width:  |  Height:  |  Size: 139 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 49 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 32 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 41 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 58 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 103 KiB